From a41dc52d626f31f1ff87cb3c0e9185bf8f0a03f0 Mon Sep 17 00:00:00 2001 From: Kyleloh <769052550@qq.com> Date: Thu, 26 Jul 2018 17:08:27 +0800 Subject: [PATCH 1/3] perf(ncform-theme-elementui): input trim --- .../src/components/control-comps/input.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/ncform-theme-elementui/src/components/control-comps/input.vue b/packages/ncform-theme-elementui/src/components/control-comps/input.vue index 0c31419..2e36aea 100755 --- a/packages/ncform-theme-elementui/src/components/control-comps/input.vue +++ b/packages/ncform-theme-elementui/src/components/control-comps/input.vue @@ -463,7 +463,12 @@ export default { ] = this.$data.appendSelectVal; } return obj; - } else { + } else if(typeof this.value === "string"){ + val = val.trim(); + this.$data.inputVal = val; + return val; + } + else{ this.$data.inputVal = val; return val; } From 7745a0c7bad70cac078ed95bc9d9193e65ae3319 Mon Sep 17 00:00:00 2001 From: Kyleloh <769052550@qq.com> Date: Fri, 27 Jul 2018 11:35:25 +0800 Subject: [PATCH 2/3] perf(ncform-theme-element): input trim config --- .../examples/control-comps/input.html | 34 ++++++++++++++----- .../src/components/control-comps/input.vue | 2 +- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/packages/ncform-theme-elementui/examples/control-comps/input.html b/packages/ncform-theme-elementui/examples/control-comps/input.html index cc0a230..16378b6 100755 --- a/packages/ncform-theme-elementui/examples/control-comps/input.html +++ b/packages/ncform-theme-elementui/examples/control-comps/input.html @@ -64,17 +64,17 @@ Vue.use(vueNcform, { extComponents: { object, input } }); let formSchemas = [ - { - title: '默认状态', - schema: { - type: 'object', - properties: { - name: { - type: 'string', + { + title: '默认状态', + schema: { + type: 'object', + properties: { + name: { + type: 'string', + } } } - } - }, + }, { title: '提供值', schema: { @@ -92,6 +92,22 @@ } } }, + { + title: '[属性] trim: 前后去空格', + schema: { + type: 'object', + properties: { + name: { + type: 'string', + ui: { + widgetConfig: { + trim: true + } + } + } + } + } + }, { title: '[属性] readonly: 只读状态', schema: { diff --git a/packages/ncform-theme-elementui/src/components/control-comps/input.vue b/packages/ncform-theme-elementui/src/components/control-comps/input.vue index 2e36aea..4ef0389 100755 --- a/packages/ncform-theme-elementui/src/components/control-comps/input.vue +++ b/packages/ncform-theme-elementui/src/components/control-comps/input.vue @@ -463,7 +463,7 @@ export default { ] = this.$data.appendSelectVal; } return obj; - } else if(typeof this.value === "string"){ + } else if(this.mergeConfig.trim && typeof this.value === "string"){ val = val.trim(); this.$data.inputVal = val; return val; From a53e6ed8eb95065a9ff1c97445ce01c0234488e7 Mon Sep 17 00:00:00 2001 From: Kyleloh <769052550@qq.com> Date: Fri, 27 Jul 2018 11:52:50 +0800 Subject: [PATCH 3/3] perf(ncform-theme-element): fix --- .../src/components/control-comps/input.vue | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/ncform-theme-elementui/src/components/control-comps/input.vue b/packages/ncform-theme-elementui/src/components/control-comps/input.vue index 4ef0389..3602cb8 100755 --- a/packages/ncform-theme-elementui/src/components/control-comps/input.vue +++ b/packages/ncform-theme-elementui/src/components/control-comps/input.vue @@ -447,6 +447,11 @@ export default { val = parseInt(val); val = isNaN(val) ? "" : val; break; + case "string": + if(this.mergeConfig.trim){ + val = val.toString().trim(); + } + break; } if (typeof this.value === "object") { @@ -463,10 +468,6 @@ export default { ] = this.$data.appendSelectVal; } return obj; - } else if(this.mergeConfig.trim && typeof this.value === "string"){ - val = val.trim(); - this.$data.inputVal = val; - return val; } else{ this.$data.inputVal = val;