Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/business/platform/data/components/search-form/index.vue

@@ -176,7 +176,7 @@
                     v-else-if="item.fieldType === 'dictionary'"
                     v-model="params[item.modelValue]"
                     :type-key="item.field_options.dictionary"
-                    style="width: 150px;"
+                    :style="itemStyle + (item.itemWidth ? `width: ${item.itemWidth}px;` : 'width: 150px')"
                     :multiple="true"
                     :disabled="item.disabled"
                     clearable
@@ -186,7 +186,7 @@
                 <ibps-user-selector
                     v-else-if="item.fieldType === 'selector'"
                     v-model="params[item.modelValue]"
-                    style="width: 150px;"
+                    :style="itemStyle + (item.itemWidth ? `width: ${item.itemWidth}px;` : 'width: 150px')"
                     :size="item.size ? item.size : 'mini'"
                     :type="item.selectorType||'user'"
                     :placeholder="item.placeholder"
@@ -204,7 +204,7 @@
                     :size="item.size ? item.size : 'mini'"
                     :disabled="item.disabled"
                     :template-key="item.field_options.dialog"
-                    style="width: 150px;"
+                    :style="itemStyle + (item.itemWidth ? `width: ${item.itemWidth}px;` : 'width: 150px')"
                     :multiple="true"
                     :store="item.field_options.store"
                     :icon="item.field_options.icon?'ibps-icon-'+item.field_options.icon:'ibps-icon-search'"
@@ -218,7 +218,7 @@
                     v-model="params[item.modelValue]"
                     :size="item.size ? item.size : 'mini'"
                     :template-key="item.field_options.linkdata"
-                    style="width: 150px;"
+                    :style="itemStyle + (item.itemWidth ? `width: ${item.itemWidth}px;` : 'width: 150px')"
                     :multiple="true"
                     :dynamic-params="getLinkDynamicParams(item.field_options,params)"
                     :value-key="getLinkValueKey(item.field_options)"

src/business/platform/data/templatebuilder/right-aside/editors/query-column.vue

@@ -57,6 +57,9 @@
         <el-form-item label="默认值">
             <el-input v-model="formData.default_value" placeholder="请输入查询字段默认值，多值以&分割，日期：xxx&xxx" />
         </el-form-item>
+        <el-form-item label="宽度">
+            <el-input v-model="formData.item_width" placeholder="请填写数字" />
+        </el-form-item>
         <!--控件类型-->
         <template v-if="formData.same === 'N'">
             <el-form-item label="控件类型">
@@ -238,7 +241,8 @@ export default {
                 common: 'Y',
                 same: 'Y',
                 field_type: 'text',
-                default_value: ''
+                default_value: '',
+                item_width: ''
             },
             rules: {
                 name: [{ required: true, message: this.$t('validate.required') }],

src/business/platform/data/templaterender/templates/list.vue

@@ -1601,6 +1601,11 @@ export default {
                     modelValue: `Q^${field.name}^${querySuffix}`
                 })
             }
+            if (field.item_width) {
+                searchColumn = Object.assign(searchColumn, {
+                    itemWidth: field.item_width
+                })
+            }
             return searchColumn
         },
         buildDisplayColumn (field) {

src/business/platform/form/formrender/dynamic-form/dynamic-form-field.vue

@@ -123,6 +123,7 @@
                     :border="fieldOptions.border"
                     :style="{ display: fieldOptions.arrangement === 'vertical' ? 'block' : null }"
                     class="ibps-pt-5"
+                    @click.native.stop.prevent="pendingRes(o.val)"
                 >
                     {{ o.label }}
                 </component>
@@ -996,6 +997,13 @@ export default {
         }
     },
     methods: {
+        pendingRes(event){
+            if(this.dataModel!=event){
+                this.dataModel=event
+            }else{
+                this.dataModel=null
+            }
+        },
         // 日期格式调整
         selectTime (val) {
             const date = new Date(new Date())