centaline-data-driven-v3 0.0.65 → 0.0.67

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "centaline-data-driven-v3",
-  "version": "0.0.65",
+  "version": "0.0.67",
   "private": false,
   "description": "centaline-data-driven-v3",
   "main": "dist/centaline-data-driven-v3.umd.js",
@@ -16,7 +16,7 @@
     "moment": "^2.30.1",
     "photo-sphere-viewer": "^4.8.1",
     "sortablejs": "^1.15.6",
-    "vant": "^4.8.0",
+    "vant": "^4.8.0", 
     "vite-plugin-css-injected-by-js": "^3.3.0",
     "vue": "^3.3.4",
     "vue-cropper": "^1.1.1",

package/src/assets/commonWeb.css

@@ -128,6 +128,9 @@ body {
   line-height: 26px;
   color: var(--centalineGray);
 }
+.el-input__suffix{
+  font-size: 12px;
+}
 
 .button-initial {
   margin-top: 8px;
@@ -358,50 +361,6 @@ body {
   color: var(--centalineBlack);
 }
 
-/* 查询搜索 */
-.search-btn,
-.more-btn {
-  height: 26px;
-  background: var(--chinaRed) !important;
-  border-color: var(--chinaRed) !important;
-  box-shadow: 0px 2px 4px 0px rgba(238, 107, 107, 0.25);
-  border-radius: 6px;
-  color: #fff !important;
-}
-
-/* 重置按钮 更多按钮*/
-.reset-btn {
-  height: 26px;
-  background: #FFFFFF !important;
-  border-color: var(--chinaRed) !important;
-  border-radius: 6px;
-  color: var(--chinaRed) !important;
-}
-
-/* 搜索按钮,重置按钮和更多按钮的hover */
-.search-btn:hover,
-.reset-btn:hover,
-.more-btn:hover {
-  background-color: var(--btnHoverRed) !important;
-  border-color: var(--btnHoverRed) !important;
-  color: #fff !important;
-}
-
-.more-btn:hover .open,
-.more-btn:hover .fold {
-  background-color: var(--btnHoverRed) !important;
-}
-
-.search-btn:active,
-.search-btn:focus,
-.reset-btn:active.reset-btn:focus,
-.more-btn:active.more-btn:focus {
-  background-color: var(--btnFocusRed);
-  border-color: var(--btnFocusRed);
-  color: #fff !important;
-}
-
-
 .subdiv_allinline {
   margin: 0;
   padding: 0;
@@ -1067,7 +1026,7 @@ body {
 .el-tag--small {
   height: auto;
   line-height: 16px;
-  padding: 3px 9px;
+  padding: 3px 5px;
 }
 
 .el-checkbox.el-checkbox--small {

package/src/components/common/video.vue

@@ -2,8 +2,8 @@
     <div class="alert fade in" role="alert"
         style="padding:0px;border-bottom:none;display: table-caption;margin-left: 5px;">
         <video :src="submitData[router.submitFormField]" controls="true" autoplay controlslist="nodownload"
-            :height="router.dialogHeight ? router.dialogHeight - 10 : '40'"
-            :width="router.dialogWidth ? router.dialogWidth - 10 : '100%'">您的浏览器不支持 video 标签。
+            :height="router.pageHeight ? router.pageHeight - 10 : '40'"
+            :width="router.pageWidth ? router.pageWidth - 10 : '100%'">您的浏览器不支持 video 标签。
         </video>
     </div>
 </template>

package/src/components/web/Button.vue

@@ -16,7 +16,7 @@
         :style="{ color: model.textColor, backgroundColor: model.imgUrl ? 'transparent' : model.bgColor, borderColor: model.imgUrl ? 'transparent' : model.borderColor, padding: model.imgUrl ? '0px' : null }"
         @click="clickHandle">{{ model.controlLabel }}</el-link>
     <el-upload v-else-if="model.isImport" :action="model.action" :data="uploadData" :headers="headers" :multiple="false"
-        :show-file-list="false" :on-success="handleAvatarSuccess" :on-error="handleAvatarError">
+        :show-file-list="false" :on-success="handleAvatarSuccess" :on-error="handleAvatarError" :before-upload="handleAvatarBeforeUpload">
         <el-button type="primary" v-bind="model.attrs"
             :style="{ color: model.textColor, backgroundColor: model.imgUrl ? 'transparent' : model.bgColor, borderColor: model.imgUrl ? 'transparent' : model.borderColor, padding: model.imgUrl ? '0px' : null }"
             :disabled="model.disabled || model.locked">
@@ -97,6 +97,19 @@ function clickHandle() {
     emit('fieldClick', model.value);
 }
 
+function handleAvatarBeforeUpload(file) {
+  if(model.value.form && model.value.form.$vue){
+    let submitData = model.value.form.$vue.getFileData(model.value);
+    for (var key in submitData) {
+      if (typeof submitData[key] === "object") {
+        uploadData.value[key] = JSON.stringify(submitData[key]);
+      }
+      else {        
+        uploadData.value[key] = submitData[key];
+      }
+    }
+  }
+}
 function handleAvatarSuccess(res) {
   emit('importComplete', res, model.value);
 }
@@ -124,4 +137,47 @@ function commandClick(code) {
     color: var(--chinaRed);
     font-weight: 700;
 }
+/* 查询搜索 */
+.search-btn,
+.more-btn {
+  height: 26px;
+  background: var(--chinaRed);
+  border-color: var(--chinaRed);
+  box-shadow: 0px 2px 4px 0px rgba(238, 107, 107, 0.25);
+  border-radius: 6px;
+  color: #fff;
+}
+
+/* 重置按钮 更多按钮*/
+.reset-btn {
+  height: 26px;
+  background: #FFFFFF;
+  border-color: var(--chinaRed);
+  border-radius: 6px;
+  color: var(--chinaRed);
+}
+
+/* 搜索按钮,重置按钮和更多按钮的hover */
+.search-btn:hover,
+.reset-btn:hover,
+.more-btn:hover {
+  background-color: var(--btnHoverRed);
+  border-color: var(--btnHoverRed);
+  color: #fff;
+}
+
+.more-btn:hover .open,
+.more-btn:hover .fold {
+  background-color: var(--btnHoverRed);
+}
+
+.search-btn:active,
+.search-btn:focus,
+.reset-btn:active.reset-btn:focus,
+.more-btn:active.more-btn:focus {
+  background-color: var(--btnFocusRed);
+  border-color: var(--btnFocusRed);
+  color: #fff;
+}
+
 </style>

package/src/components/web/ComboBox.vue

@@ -6,14 +6,15 @@
                 :placeholder="model.placeholder" @visible-change="visibleChange" @clear="clear"
                 :filterable="model.filterable" :multiple="model.multiple" class="fieldControl" :height="300"
                 @click="clickHandler" :class="[model.moreActionRouter ? 'selectmore' : '', open ? 'open' : '']"
-                :filter-method="getOptions">
+                :filter-method="debouncedRemoteMethod" @compositionstart="handleCompositionStart"
+                @compositionend="handleCompositionEnd">
                 <template #default="{ item }">
                     <el-tooltip :disabled="!item.toolTip" :content="item.toolTip" placement="right">
                         <span v-html="item.displayName || item.name"></span>
                     </el-tooltip>
                 </template>
                 <template #prefix
-                    v-if="(model.isList && model.value && !model.multiple) || (model.multiple && model.isList && model.labelValue && model.labelValue.length > 0 && model.placeholder)">
+                    v-if="((model.isList && model.value && !model.multiple) || (model.multiple && model.isList && model.labelValue && model.labelValue.length > 0 && model.placeholder)) && model.prefix">
                     <span>{{ model.prefix }}</span>
                 </template>
                 <template #tag>
@@ -57,6 +58,7 @@ const model = initData(props, ComboBox)
 const refselect = ref()
 const open = ref(false)
 const itemKey = ref(Math.random())
+const isComposing = ref(false);
 
 //下拉框出现/隐藏时触发
 function visibleChange(visible) {
@@ -79,8 +81,9 @@ function visibleChange(visible) {
 }
 //获取数据列表
 function getOptions(key) {
-    if (!model.value.moreActionRouter) {
+    if (!isComposing.value &&!model.value.moreActionRouter) {
         model.value.getOptions(props.parameterAction, key, function (data) {
+          if(data){
             data.forEach((v) => {
                 let item = model.value.globalOptions.find((v1) => {
                     return v1.code === v.code && v1.locked;
@@ -113,10 +116,25 @@ function getOptions(key) {
             nextTick(function () {
                 setminWidth()
             });
+          }
         })
     }
 
 }
+// 防抖函数
+function debounce(func, delay) {
+    let timer = null;
+    return function () {
+        const context = this;
+        const args = arguments;
+        clearTimeout(timer);
+        timer = setTimeout(() => {
+            func.apply(context, args);
+        }, delay);
+    };
+}
+// 创建防抖后的远程搜索方法，延迟 300 毫秒
+const debouncedRemoteMethod = debounce(getOptions, 300);
 //选中值发生变化时触发
 function change(val) {
     if (typeof val == 'undefined') {
@@ -131,6 +149,13 @@ function change(val) {
     if (model.value.autoSearch) emit('search');
 
 }
+function handleCompositionStart() {
+    isComposing.value = true;
+}
+
+function handleCompositionEnd() {
+    isComposing.value = false;
+}
 //弹出选择列表
 function popupSearchListHandle() {
     emit('popupSearchList', false, model, model.value.moreActionRouter, (optionArr) => {
@@ -181,7 +206,7 @@ function setminWidth() {
             }
         }
     }
-  
+
     let span = document.createElement('span');
     span.innerText = text;
     span.style.whiteSpace = 'nowrap';

package/src/components/web/Form.vue

@@ -1,5 +1,5 @@
 <template>
-    <div ref="refForm" v-loading="loading">
+    <div ref="refForm" v-loading="loading" :style="{'min-height': minHeight}">
         <div v-if="model !== null && !loading" class="ct-form">
             <el-affix target=".ct-form" v-if="model.tip" :offset="62">
                 <div class="ct-form-tip">
@@ -138,7 +138,7 @@
     </div>
 </template>
 <script lang="ts" setup>
-import { ref, nextTick, onUpdated,onDeactivated } from 'vue'
+import { ref, nextTick, onUpdated,onDeactivated , onMounted  } from 'vue'
 import { RouterClickHandler } from '../../utils/mixins';
 import common from '../../utils/common'
 import Form from '../../loader/src/Form'
@@ -205,6 +205,7 @@ const Fields = ref()
 const refForm = ref()
 const qrtimer = ref(null)
 const downloadUrl = ref('')
+const minHeight = ref('auto')
 onUpdated(() => {
     nextTick(() => {
         qrtimer.value = setTimeout(getisScroll, 100);
@@ -213,6 +214,9 @@ onUpdated(() => {
 onDeactivated(() => {
   downloadUrl.value=''
 })
+onMounted(() => {
+  setCss();
+})
 init()
 //初始化数据
 function init() {
@@ -535,4 +539,9 @@ function flagNotificationParentAfterContentChanged() {
 function updateFields(data) {
     Form.updateFields(data, model.value)
 }
+function setCss() {
+  if (props.topHeight > -1) {
+    minHeight.value = (document.documentElement.clientHeight - props.topHeight - 20) + 'px';
+  }
+}
 </script>

package/src/components/web/FormList.vue

@@ -68,6 +68,9 @@
                 </div>
             </template>
             <template v-else>
+                <div v-if="model.controlLabel" class="list-title">
+                    <h5>{{ model.controlLabel }}</h5>
+                </div>
                 <div class="list-button">
                     <component v-if="model.selectRouter !== null" :is="model.selectRouter.is"
                         :vmodel="model.selectRouter" @click="popupSearchListHandle(model.selectRouter)"></component>
@@ -79,33 +82,37 @@
                 <el-table :data="model.tableData" border :show-summary="model.showSummary"
                     :summary-method="getSummaries" style="width: 100%" highlight-current-row>
                     <template v-if="model.rowActionRoutersAlign === 1">
-                      <el-table-column label="操作"
-                        v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" :width="'100%'">
-                        <template #header="{ column, $index }">
-                            {{ setcolumnminWidth(column) }}
-                            <span style="width:auto; white-space: nowrap;">{{ column.label }}</span>
-                        </template>
-                        <template #default="scope">
-                            <el-tag :disable-transitions="true" v-if="scope.row.edit || scope.row.isSet" type="success"
-                                @click="saveRow(scope.row, scope.$index, true)" style="cursor: pointer;">{{
-                                    scope.row.isSet
-                                        ?
-                                        '保存' :
-                                        "修改" }}</el-tag>
-                            <el-tag :disable-transitions="true" v-if="scope.row.delete && !scope.row.isSet"
-                                style="cursor: pointer;" type="danger"
-                                @click="deleteRow(scope.$index, scope.row.$sourceIndex)">删除</el-tag>
-                            <el-tag :disable-transitions="true" v-else-if="scope.row.isSet"
-                                @click="saveRow(scope.row, scope.$index, false)" style="cursor: pointer;">取消</el-tag>
-                            <template v-for="(v, i) in model.buttons">
-                                <el-tag
-                                    v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
-                                    style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label }} 1</el-tag>
-
+                        <el-table-column label="操作"
+                            v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0"
+                            :width="'100%'">
+                            <template #header="{ column, $index }">
+                                {{ setcolumnminWidth(column) }}
+                                <span style="width:auto; white-space: nowrap;">{{ column.label }}</span>
                             </template>
+                            <template #default="scope">
+                                <el-tag :disable-transitions="true" v-if="scope.row.edit || scope.row.isSet"
+                                    type="success" @click="saveRow(scope.row, scope.$index, true)"
+                                    style="cursor: pointer;">{{
+                                        scope.row.isSet
+                                            ?
+                                            '保存' :
+                                            "修改" }}</el-tag>
+                                <el-tag :disable-transitions="true" v-if="scope.row.delete && !scope.row.isSet"
+                                    style="cursor: pointer;" type="danger"
+                                    @click="deleteRow(scope.$index, scope.row.$sourceIndex)">删除</el-tag>
+                                <el-tag :disable-transitions="true" v-else-if="scope.row.isSet"
+                                    @click="saveRow(scope.row, scope.$index, false)"
+                                    style="cursor: pointer;">取消</el-tag>
+                                <template v-for="(v, i) in model.buttons">
+                                    <el-tag
+                                        v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
+                                        style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label }}
+                                        1</el-tag>
 
-                        </template>
-                      </el-table-column>
+                                </template>
+
+                            </template>
+                        </el-table-column>
                     </template>
                     <template v-for="(v, i) in model.rows[0].field" :key="i">
                         <el-table-column :prop="v.fieldName1" :label="v.controlLabel" :width="v.width"
@@ -137,33 +144,37 @@
                         </el-table-column>
                     </template>
                     <template v-if="model.rowActionRoutersAlign !== 1">
-                      <el-table-column label="操作"
-                        v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0" :width="'100%'">
-                        <template #header="{ column, $index }">
-                            {{ setcolumnminWidth(column) }}
-                            <span style="width:auto; white-space: nowrap;">{{ column.label }}</span>
-                        </template>
-                        <template #default="scope">
-                            <el-tag :disable-transitions="true" v-if="scope.row.edit || scope.row.isSet" type="success"
-                                @click="saveRow(scope.row, scope.$index, true)" style="cursor: pointer;">{{
-                                    scope.row.isSet
-                                        ?
-                                        '保存' :
-                                        "修改" }}</el-tag>
-                            <el-tag :disable-transitions="true" v-if="scope.row.delete && !scope.row.isSet"
-                                style="cursor: pointer;" type="danger"
-                                @click="deleteRow(scope.$index, scope.row.$sourceIndex)">删除</el-tag>
-                            <el-tag :disable-transitions="true" v-else-if="scope.row.isSet"
-                                @click="saveRow(scope.row, scope.$index, false)" style="cursor: pointer;">取消</el-tag>
-                            <template v-for="(v, i) in model.buttons">
-                                <el-tag
-                                    v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
-                                    style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label }} 1</el-tag>
-
+                        <el-table-column label="操作"
+                            v-if="model.rows[0].edit || model.rows[0].delete || model.buttons.length > 0"
+                            :width="'100%'">
+                            <template #header="{ column, $index }">
+                                {{ setcolumnminWidth(column) }}
+                                <span style="width:auto; white-space: nowrap;">{{ column.label }}</span>
                             </template>
+                            <template #default="scope">
+                                <el-tag :disable-transitions="true" v-if="scope.row.edit || scope.row.isSet"
+                                    type="success" @click="saveRow(scope.row, scope.$index, true)"
+                                    style="cursor: pointer;">{{
+                                        scope.row.isSet
+                                            ?
+                                            '保存' :
+                                            "修改" }}</el-tag>
+                                <el-tag :disable-transitions="true" v-if="scope.row.delete && !scope.row.isSet"
+                                    style="cursor: pointer;" type="danger"
+                                    @click="deleteRow(scope.$index, scope.row.$sourceIndex)">删除</el-tag>
+                                <el-tag :disable-transitions="true" v-else-if="scope.row.isSet"
+                                    @click="saveRow(scope.row, scope.$index, false)"
+                                    style="cursor: pointer;">取消</el-tag>
+                                <template v-for="(v, i) in model.buttons">
+                                    <el-tag
+                                        v-if="!scope.row.isSet && v.show && (!v.rightField || !scope.row[v.rightField] || scope.row[v.rightField].value == 1)"
+                                        style="cursor: pointer;" @click="buttonClick(scope.row, v)">{{ v.label }}
+                                        1</el-tag>
+
+                                </template>
 
-                        </template>
-                      </el-table-column>
+                            </template>
+                        </el-table-column>
                     </template>
                     <template #empty>
                         {{ common.LocalizedString('暂无数据', '暫無數據') }}
@@ -425,7 +436,7 @@ function fieldsValidExcute() {
                             if (i === 0) {
                                 if (f.displayValidMessage) {
                                     model.value.displayValidMessage = f.displayValidMessage;
-                                } 
+                                }
                             }
                             i++;
                             rtnBool = false;
@@ -577,6 +588,12 @@ defineExpose({
 })
 </script>
 <style scoped>
+.list-title {
+    padding-bottom: 5px;
+    text-align: left;
+    display: inline-table;
+}
+
 .list-button {
     padding-bottom: 5px;
     text-align: right;
@@ -591,6 +608,7 @@ defineExpose({
     width: 100%;
 }
 
+
 .ct-form-repeat .list-title {
     padding-bottom: 5px;
     text-align: left;

package/src/components/web/RadioButton.vue

@@ -25,8 +25,15 @@ const props = defineProps({
 const model = initData(props, RadioButton)
 
 function change() {
-    changeHandler(model.value, emit);
-    if (model.value.autoSearch) emit('search');
+  if(model.value.code1){
+    model.value.selectItems1.forEach((v) => {
+      if(model.value.code1===v.code){
+        model.value.name1=v.name;
+      }
+    });
+  }
+  changeHandler(model.value, emit);    
+  if (model.value.autoSearch) emit('search');
 }
 function clearClickHandle() {
     model.value.reset()

package/src/components/web/SearchList/Tablecurrency.vue

@@ -38,8 +38,8 @@
                         </button>
                         <video ref="video" :src="rowData[router.submitFormField]" controls="true"
                             controlslist="nodownload" @timeupdate="saveVoiceHistoryHandler" @ended="voiceEndedHandler"
-                            :height="router.dialogHeight ? router.dialogHeight : '40'"
-                            :width="router.dialogWidth ? router.dialogWidth : '100%'">您的浏览器不支持 video 标签。
+                            :height="router.pageHeight ? router.pageHeight : '40'"
+                            :width="router.pageWidth ? router.pageWidth : '100%'">您的浏览器不支持 video 标签。
                         </video>
                     </div>
                     <img v-if="router.imgUrl && isShowImg" slot="reference"
@@ -107,7 +107,7 @@ const option = ref({
 const tooltipModel = ref({});
 const labelColor = ref('')
 const video = ref()
-const label = computed(() => {
+const label = computed(() => {  
     return (typeof props.colValue === "undefined" || props.colValue === '') ? props.router.controlLabel : props.colValue
 })
 const isShowLabel = computed(() => {
@@ -127,6 +127,7 @@ const isShowLabel = computed(() => {
     }
     return flag;
 })
+
 isVisited()
 function isVisited() {
     var key = props.router.action + props.rowData.chanceID;

package/src/components/web/SearchScreen.vue

@@ -22,7 +22,7 @@
                             @SaveSearchWhere="SaveSearchWhere" @SearchWhereManage="SearchWhereManage"
                             @clickSearchWhere="clickSearchWhere"></component>
                         <br v-else-if="col.controlType === Enum.ControlType.LineFeed" />
-                        <component v-else :from="from" class="list-field" ref="Fields" v-bind="col.listBind"
+                        <component v-else :from="from" class="list-field" v-bind="col.listBind"
                             :is="col.is" :vmodel="col" :parameterAction="model.parameterAction"
                             @search="searchHandler(col)" @change="changeHandler(col)">
                         </component>
@@ -48,12 +48,12 @@
             </div>
         </div>
         <iframe :src="downloadUrl"
-        style="height:0px;width:0px;border-width: 0px;position: absolute;bottom: 0px;display: none;">
-      </iframe>
+            style="height:0px;width:0px;border-width: 0px;position: absolute;bottom: 0px;display: none;">
+        </iframe>
     </div>
 </template>
 <script setup lang="ts">
-import { ref, nextTick,onDeactivated } from 'vue'
+import { ref, nextTick, onDeactivated } from 'vue'
 import SearchScreen from '../../loader/src/SearchScreen'
 import Form from '../../loader/src/Form'
 import Enum from '../../utils/Enum'
@@ -88,7 +88,7 @@ const Fields = ref()
 const downloadUrl = ref('')
 
 onDeactivated(() => {
-  downloadUrl.value=''
+    downloadUrl.value = ''
 })
 
 searchComplate()
@@ -178,11 +178,15 @@ function searchHandler(field) {
 //组件数据验证
 function validExcute() {
     var rtnBool = true;
+    var i = 0;
     if (Fields.value) {
         Fields.value.forEach((f) => {
             if (f.model && typeof f.model.validExcute !== 'undefined') {
                 if (!f.model.validExcute()) {
-                    common.message(f.model.displayValidMessage)
+                    if (i === 0) {
+                        common.message(f.model.displayValidMessage)
+                    }
+                    i++
                     rtnBool = false;
                 }
             }

package/src/components/web/SensitiveEye.vue

@@ -2,7 +2,7 @@
     <ct-field :vmodel="model">
         <template #Control>
             <span class="eyelabel">{{ showLable == true ? model.code1 : model.name1 }}</span>
-            <el-icon size="16" v-if="model.name1" @click="onSensitiveEye()" style="margin-top: -2px;">
+            <el-icon size="16" v-if="model.name1" @click="onSensitiveEye()" style="margin-top: 5px;">
                 <View v-if="showLable" />
                 <Hide v-else />
             </el-icon>
@@ -57,6 +57,7 @@ defineExpose({
 </script>
 <style scoped>
 .eyelabel {
-    min-width: 80px;
+  min-width: 80px;
+  line-height: 26px;
 }
 </style>

package/src/components/web/TextBox.vue

@@ -2,7 +2,7 @@
     <ct-field :vmodel="model">
         <template #Control>
           <div v-if="model.controlType === Enum.ControlType.MultiLineText" style="width: 100%;">
-            <el-input :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="change()"
+            <el-input :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()" @change="change()"
                 :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
                 :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
                 :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()" class="fieldControl">
@@ -12,7 +12,7 @@
             </el-input>
             <span v-if="model.sufLabel1" class="sufLabel" v-html="model.sufLabel1"></span>
           </div>
-          <el-input v-else :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="change()"
+          <el-input v-else :type="model.inputType" v-model="model.code1" v-bind="model.attrs" @input="input()" @change="change()"
                 :disabled="model.locked" :rows="model.rows" :readonly="model.readonly"
                 :show-password="model.inputType == 'password'" autocomplete="on" :maxlength="model.maxValue1"
                 :show-word-limit="model.showWordLimit" clearable @keyup.enter.native="search()" class="fieldControl">
@@ -51,10 +51,16 @@ function search() {
         emit('search');
     }
 }
- 
+function input() {
+  if(model.value.controlType===Enum.ControlType.MultiLineText || model.value.controlType===Enum.ControlType.TextBox){
+  }
+  else{
+    change();
+  }
+} 
 function change() {
-    changeHandler(model.value, emit);
-    if (props.from == 'tree') { emit('search'); }
+  changeHandler(model.value, emit);
+  if (props.from == 'tree') { emit('search'); }
 }
 //弹出选择列表
 function popupSearchListHandle() {

package/src/loader/src/Button.js

@@ -7,15 +7,15 @@ const Button = function (source) {
     let rtn = {
         icon: '',
         get bgColor() {
-            if (source.controlType == Enum.ControlType.ButtonReset) {
-                return '#519DA6'
-            }
+            // if (source.controlType == Enum.ControlType.ButtonReset) {
+            //     return '#519DA6'
+            // }
             return source.bgColor
         },
         get borderColor() {
-            if (source.controlType == Enum.ControlType.ButtonReset) {
-                return '#519DA6'
-            }
+            // if (source.controlType == Enum.ControlType.ButtonReset) {
+            //     return '#519DA6'
+            // }
             return source.borderColor
         },
         get action() {

package/src/loader/src/Form.js

@@ -109,6 +109,7 @@ function loadFromModel(source, isFormList) {
               rtn1["options"][0]["value"] = attrValue
             }
             if (attrKey == 'name1') {
+              rtn1["name1"] = attrValue;
               rtn1["options"][0]["label"] = attrValue
             }
           }