cnhis-design-vue 2.1.11 → 2.1.12

package/packages/table-filter/src/quick-search/QuickSearch.vue

@@ -157,7 +157,7 @@
                 <template v-if="showPercent(item)">
                   <a-input-number
                     class="CL-input"
-                    style="width: 200px"
+                    :style="`width: ${getEleWidth(item)}`"
                     v-model="item.CL"
                     :min="0"
                     :max="100"
@@ -168,7 +168,7 @@
                   <a-input
                     class="CL-input"
                     :style="{
-                      width: '200px',
+                      width: `${getEleWidth(item)}`,
                       'font-family': item.PASSWORDTYPE ? 'text-security-disc' : 'inherit'
                     }"
                     v-model="item.CL"
@@ -190,7 +190,7 @@
                 <template v-if="showPercent(item)">
                   <a-input-number
                     class="EQ-input"
-                    style="width: 200px"
+                    :style="`width: ${getEleWidth(item)}`"
                     v-model="item.EQ"
                     :min="0"
                     :max="100"
@@ -202,7 +202,7 @@
                     :class="{ 'psw-icon': item.comAttr == 'PASSWORD' }"
                     class="EQ-input"
                     :style="{
-                      width: '200px',
+                      width: `${getEleWidth(item)}`,
                       'font-family': item.PASSWORDTYPE ? 'text-security-disc' : 'inherit'
                     }"
                     v-model="item.EQ"
@@ -225,14 +225,14 @@
               <div v-if="item.con == 'DATE'">
                 <a-radio-group v-model="item.DATE.con" buttonStyle="solid">
                   <a-radio-button
-                    v-for="date in dateTeam"
+                    v-for="date in item.dateTeam"
                     v-show="!item.showDate"
                     @click="clickRadioGroup(item.DATE, date.con)"
                     :key="date.con"
                     :value="date.con"
                     >{{ getI18nText(date.title, date.name) }}
                   </a-radio-button>
-                  <span :class="['check-date-btn', item.marginx]" @click="checkDate(item)">{{
+                  <span v-show="item.advanceOptionSetting != 1" :class="['check-date-btn', item.marginx]" @click="checkDate(item)">{{
                     getI18nText('1.1.4.52', '选择时间')
                   }}</span>
                   <div class="check-date" v-show="item.showDate">
@@ -336,7 +336,7 @@
                   {{ sea.showKeys || sea.myName }}
                 </a-select-option>
               </a-select> -->
-              <template  v-if="item.con == 'QUOTE'">
+              <template  v-if="item.con == 'QUOTE' || item.com == 'SelectMui'">
                 <c-tree-select
                   v-if="item.comType === 'treeSelect'"
                   :item="item"
@@ -357,7 +357,7 @@
 
               <a-checkbox-group
                 class="check-box"
-                v-if="item.con == 'CONVERT'"
+                v-else-if="item.con == 'CONVERT'"
                 :options="item.setting.showSetting"
                 v-model="item.CONVERT"
               />
@@ -487,7 +487,7 @@
                     <template v-if="showPercent(item)">
                       <a-input-number
                         class="CL-input"
-                        style="width: 200px"
+                        :style="`width: ${getEleWidth(item)}`"
                         v-model="item.CL"
                         :min="0"
                         :max="100"
@@ -495,7 +495,7 @@
                       />
                     </template>
                     <template v-else>
-                      <a-input class="CL-input" style="width: 200px" v-model="item.CL" allowClear>
+                      <a-input class="CL-input" :style="`width: ${getEleWidth(item)}`" v-model="item.CL" allowClear>
                       </a-input>
                     </template>
                   </template>
@@ -503,7 +503,7 @@
                     <template v-if="showPercent(item)">
                       <a-input-number
                         class="EQ-input"
-                        style="width: 200px"
+                        :style="`width: ${getEleWidth(item)}`"
                         v-model="item.EQ"
                         :min="0"
                         :max="100"
@@ -513,7 +513,7 @@
                     <template v-else>
                       <a-input
                         class="EQ-input"
-                        style="width: 200px"
+                        :style="`width: ${getEleWidth(item)}`"
                         v-model="item.EQ"
                         :placeholder="item.isPreciseSearch || item.fieldType == 'JSONB' ? '' : getI18nText('1.9.6', '区间搜素用~分割')"
                         allowClear
@@ -728,6 +728,7 @@ import wordBookutils from '../mixins/wordBookutils';
 import cTreeSelect from '../components/c-tree-select/tree-select';
 import create from '@/core/create';
 import utils from '@/utils/utils-map';
+import {dataOptions} from '../const/dataOptions'
 export default create({
   name: "quick-search",
   mixins: [durationMixin, $utils, filterApiFn, tableSearchCon],
@@ -789,6 +790,11 @@ export default create({
         return item.settingObj?.attr === "PERCENTAGE" || false;
       };
     },
+    getEleWidth(){
+      return function(item) {
+        return `${item.advanceColWidth||200}px`
+      }
+    },
     hasRelationQuickSearch() {
       return this.relationQuickSearch.findIndex(i => i.fieldList && i.fieldList.length) != -1;
     },
@@ -840,7 +846,7 @@ export default create({
         { title: '1.2.5.58', units: 1, con: 'DAY', name: '天' },
         { title: '1.2.5.59', units: 2, con: 'WEEK', name: '周' },
         { title: '1.2.1.11.18', units: 1, con: 'MONTH', name: '月' },
-        { title: '1.9.273', units: 1, con: 'YEAR', name: '岁' }
+        { title: '1.9.273', units: 1, con: 'YEAR', name: '岁' },
       ],
       isChangeWindow: false,
       modalWidth: "700px",
@@ -851,7 +857,8 @@ export default create({
       parentNames: [],
       showAdd: false,
       addVal: "",
-      fetchingWordbook: false
+      fetchingWordbook: false,
+      ...dataOptions
     };
   },
   watch: {
@@ -996,11 +1003,17 @@ export default create({
         if (el.setting) {
           // el.seting 可能是 string / object
           el.setting = typeof el.setting == "string" ? JSON.parse(el.setting) : el.setting;
+
+           let advanceOptionSetting = el?.advanceOptionSetting;
+          //  单选
+           let optionSetting0  =String(advanceOptionSetting) == '0';
           if (!vexutils.isEmpty(el.setting.wordbook)) {
             let isTree = "tree" === el?.setting?.wordbook?.showType;
             let comType = isTree ? 'treeSelect' : 'SelectMuiWordBook';
             let defVal = isTree ? [] : [];
-
+            if(optionSetting0){
+              defVal = ""
+            }
             this.$set(el, "con", "QUOTE");
             this.$set(el, "dataSource", []);
             this.$set(el, "QUOTE", []);
@@ -1032,8 +1045,21 @@ export default create({
             //   this.$set(set, "label", set.change_text);
             //   this.$set(set, "value", JSON.stringify(set.filter));
             // });
+            /**
+             * 映射方式的单选模式
+             */
+            if(optionSetting0){
+              this.$set(el, "com", "SelectMui");
+              this.$set(el, "comType", "SelectMui");
+              const labelList = el.setting.showSetting.map(i => {
+                i.labelName = i.change_text;
+                return i;
+              });
+              this.$set(el, "labelList", labelList);
+            }
+
             this.$set(el.setting, "showSetting", showSetting);
-            this.$set(el, "CONVERT", []);
+            this.$set(el, "CONVERT",optionSetting0? "": []);
             return;
           }
         }
@@ -1076,15 +1102,21 @@ export default create({
           } else {
             // 判断是否有默认值
             const value = this.getSearchDefValueByLimit(el, this.searchFieldLimit);
-            const hasValue = Array.isArray(value);
+            let hasValue = Array.isArray(value);
+            let advanceOptionSetting = el?.advanceOptionSetting;
+            // 选择时间模式
+            let optionSetting1  =String(advanceOptionSetting) == '1'
+
             this.$set(el, "con", "DATE");
-            this.$set(el, "showDate", hasValue);
-            this.$set(el, "marginx", hasValue ? "mr" : "ml");
+            this.$set(el, "showDate", optionSetting1 || hasValue);
+            this.$set(el, "marginx",optionSetting1 ||  hasValue ? "mr" : "ml");
             this.$set(el, "DATE", {
               con: hasValue ? "IN" : null,
               start_val: hasValue ? value[0] : null,
               end_val: hasValue ? value[1] : null
             });
+            let dateTeam = optionSetting1 ? [] : this[`dateTeam${advanceOptionSetting}`] || this.dateTeam0;
+            this.$set(el, 'dateTeam' , dateTeam)
           }
         } else if (el.fieldType == "TEXT") {
           /**
@@ -1165,6 +1197,7 @@ export default create({
       }
     },
     dropdownVisibleChange(open, item) {
+       if (item.comType == "SelectMui" && String(item.advanceOptionSetting) === '0') return;
       if (open) {
         let obj = {};
         if (item.setting.wordbook.params) {
@@ -1187,6 +1220,7 @@ export default create({
      * 输入自动联想
      */
     handleSearch(value, item, config={}) {
+      if (item.comType == "SelectMui" && String(item.advanceOptionSetting) === '0') return;
       let params = {
         keyword: value,
         autograph: this.curAutograph
@@ -1288,6 +1322,9 @@ export default create({
         let item = arr[i];
         let value = "";
         let limit_date = "";
+        let advanceOptionSetting = item?.advanceOptionSetting;
+          //  单选
+        let optionSetting0  =String(advanceOptionSetting) === '0';
         if (item.EQ || item.CL) {
           value = item.EQ || item.CL;
           if (item.settingObj?.attr === "PERCENTAGE") {
@@ -1320,6 +1357,14 @@ export default create({
             }
             return item;
           });
+        } else if((item.comType == 'SelectMui'&& optionSetting0)){
+          let i = item.value;
+          let c = item?.labelList[i];
+          if (item.con == "CONVERT") {
+           value = c?.filter
+          } else {
+           value= c?.labelName;
+          }
         } else if (item.DATE && !item.AGEAttr) {
           // 年龄组件的不按照 date 类型处理
           if (item.DATE.start_val || item.DATE.end_val) {