diff --git a/packages/ncform-theme-elementui/src/components/control-comps/color-picker.vue b/packages/ncform-theme-elementui/src/components/control-comps/color-picker.vue index 28885ae..8185d7d 100755 --- a/packages/ncform-theme-elementui/src/components/control-comps/color-picker.vue +++ b/packages/ncform-theme-elementui/src/components/control-comps/color-picker.vue @@ -10,6 +10,7 @@ diff --git a/packages/ncform-theme-elementui/src/components/control-comps/input-number.vue b/packages/ncform-theme-elementui/src/components/control-comps/input-number.vue index 72d049b..5519cbe 100755 --- a/packages/ncform-theme-elementui/src/components/control-comps/input-number.vue +++ b/packages/ncform-theme-elementui/src/components/control-comps/input-number.vue @@ -7,10 +7,7 @@ v-else v-model="modelVal" :disabled="disabled || readonly" - :min="mergeConfig.min" - :max="mergeConfig.max" - :step="mergeConfig.step" - :size="mergeConfig.size" + v-bind="mergeConfig" > @@ -22,6 +19,9 @@ clear: none; } } + .el-input-number { + width: 100%; + } } .v-layout { @@ -30,6 +30,9 @@ clear: both; } } + .el-input-number { + width: 100%; + } } .ncform-input-number-preview { diff --git a/packages/ncform-theme-elementui/src/components/control-comps/rate.vue b/packages/ncform-theme-elementui/src/components/control-comps/rate.vue index 75ed673..9a01e10 100755 --- a/packages/ncform-theme-elementui/src/components/control-comps/rate.vue +++ b/packages/ncform-theme-elementui/src/components/control-comps/rate.vue @@ -4,20 +4,7 @@ v-model="modelVal" :disabled="disabled || readonly" :placeholder="placeholder" - :max="mergeConfig.max" - :allow-half="mergeConfig.allowHalf" - :low-threshold="mergeConfig.lowThreshold" - :high-threshold="mergeConfig.highThreshold" - :colors="mergeConfig.colors" - :void-color="mergeConfig.voidColor" - :disabled-void-color="mergeConfig.disabledVoidColor" - :icon-classes="mergeConfig.iconClasses" - :void-icon-class="mergeConfig.voidIconClass" - :disabled-void-icon-class="mergeConfig.disabledVoidIconClass" - :show-text="mergeConfig.showText" - :show-score="mergeConfig.showScore" - :text-color="mergeConfig.textColor" - :texts="mergeConfig.texts" + v-bind="mergeConfig" > diff --git a/packages/ncform-theme-elementui/src/components/control-comps/slider.vue b/packages/ncform-theme-elementui/src/components/control-comps/slider.vue index 1870393..1bcdf7f 100755 --- a/packages/ncform-theme-elementui/src/components/control-comps/slider.vue +++ b/packages/ncform-theme-elementui/src/components/control-comps/slider.vue @@ -4,9 +4,7 @@ v-model="modelVal" :disabled="disabled || readonly" :placeholder="placeholder" - :min="mergeConfig.min" - :max="mergeConfig.max" - :step="mergeConfig.step" + v-bind="mergeConfig" > diff --git a/packages/ncform-theme-elementui/src/components/control-comps/switch.vue b/packages/ncform-theme-elementui/src/components/control-comps/switch.vue index 3ccd946..a19bcb4 100644 --- a/packages/ncform-theme-elementui/src/components/control-comps/switch.vue +++ b/packages/ncform-theme-elementui/src/components/control-comps/switch.vue @@ -3,15 +3,7 @@ diff --git a/packages/ncform-theme-elementui/src/components/control-comps/textarea.vue b/packages/ncform-theme-elementui/src/components/control-comps/textarea.vue index 5f8a8ba..da48919 100755 --- a/packages/ncform-theme-elementui/src/components/control-comps/textarea.vue +++ b/packages/ncform-theme-elementui/src/components/control-comps/textarea.vue @@ -5,12 +5,11 @@ v-else v-show="!hidden" v-model="inputVal" + v-bind="mergeConfig" type="textarea" :disabled="disabled" :readonly="readonly" :placeholder="placeholder" - :rows="mergeConfig.rows" - :autosize="mergeConfig.autoSize" @blur="onBlur" > diff --git a/packages/ncform-theme-elementui/src/components/control-comps/upload.vue b/packages/ncform-theme-elementui/src/components/control-comps/upload.vue index a0a15cb..0571b82 100755 --- a/packages/ncform-theme-elementui/src/components/control-comps/upload.vue +++ b/packages/ncform-theme-elementui/src/components/control-comps/upload.vue @@ -40,23 +40,14 @@ ref="upload" :class="[readonly ? 'is-read-only' : '']" :disabled="readonly || disabled" - :action="mergeConfig.uploadUrl" - :multiple="mergeConfig.multiple" - :data="mergeConfig.data" + v-bind="mergeConfig" :show-file-list="showFileList" - :drag="mergeConfig.drag" - :accept="mergeConfig.accept" - :list-type="mergeConfig.listType" - :auto-upload="mergeConfig.autoUpload" - :limit="mergeConfig.limit" :on-change="handleUploadChange" :on-success="handleUploadSucess" :on-error="handleUploadError" :on-exceed="handleUploadExceed" :on-remove="handleUploadRemove" :file-list="fileList" - :name="mergeConfig.fileField" - :headers="mergeConfig.headers" >