cnhis-design-vue 2.1.11 → 2.1.14

package/packages/table-filter/src/components/out-quick-search/out-quick-search.vue

@@ -5,7 +5,7 @@
         @pressEnter="outFilterChange"
         class="CL-input"
         :style="{
-          width: '200px',
+          width: `${item.advanceColWidth || 200}px`,
           margin: '0 8px 8px 0',
           'font-family': item.PASSWORDTYPE ? 'text-security-disc' : 'inherit'
         }"

package/packages/table-filter/src/const/dataOptions.js

@@ -0,0 +1,43 @@
+export const dataOptions = {
+  dateTeam0: [
+    { con: 'TODAY', title: '1.1.4.37', name: '今天' },
+    { con: 'TOMORROW', title: '1.1.4.38', name: '明天' },
+    { con: 'YESTERDAY', title: '1.1.4.39', name: '昨天' },
+    { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
+    { con: 'NEXT_WEEK', title: '1.1.4.41', name: '下周' },
+    { con: 'UP_WEEK', title: '1.1.4.42', name: '上周' },
+    { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
+    { con: 'NEXT_MONTH', title: '1.1.4.44', name: '下月' },
+    { con: 'UP_MONTH', title: '1.1.4.45', name: '上月' },
+    { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
+    { con: 'NEXT_SEASON', title: '1.1.4.47', name: '下季度' },
+    { con: 'UP_SEASON', title: '1.1.4.48', name: '上季度' },
+    { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
+    { con: 'NEXT_YEAR', title: '1.1.4.50', name: '下年' },
+    { con: 'UP_YEAR', title: '1.1.4.51', name: '上年' }
+  ],
+  dateTeam2: [
+    { con: 'TODAY', title: '1.1.4.37', name: '今天' },
+    { con: 'TOMORROW', title: '1.1.4.38', name: '明天' },
+    { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
+    { con: 'NEXT_WEEK', title: '1.1.4.41', name: '下周' },
+    { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
+    { con: 'NEXT_MONTH', title: '1.1.4.44', name: '下月' },
+    { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
+    { con: 'NEXT_SEASON', title: '1.1.4.47', name: '下季度' },
+    { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
+    { con: 'NEXT_YEAR', title: '1.1.4.50', name: '下年' }
+  ],
+  dateTeam3: [
+    { con: 'TODAY', title: '1.1.4.37', name: '今天' },
+    { con: 'YESTERDAY', title: '1.1.4.39', name: '昨天' },
+    { con: 'THIS_WEEK', title: '1.1.4.40', name: '本周' },
+    { con: 'UP_WEEK', title: '1.1.4.42', name: '上周' },
+    { con: 'THIS_MONTH', title: '1.1.4.43', name: '本月' },
+    { con: 'UP_MONTH', title: '1.1.4.45', name: '上月' },
+    { con: 'THIS_SEASON', title: '1.1.4.46', name: '本季度' },
+    { con: 'UP_SEASON', title: '1.1.4.48', name: '上季度' },
+    { con: 'THIS_YEAR', title: '1.1.4.49', name: '本年' },
+    { con: 'UP_YEAR', title: '1.1.4.51', name: '上年' }
+  ]
+};

package/packages/table-filter/src/mixins/mixins.js

@@ -403,7 +403,8 @@ export const outQuickSearchFn = {
           * isPreciseSearch: 0/1
           */
         let textCon = el.fieldType == "TEXT" &&  isPreciseSearch == 1 ? 'EQ' : 'CL';
-
+        let advanceOptionSetting = el.advanceOptionSetting;
+        // let advanceColWidth = el.advanceColWidth;
         // 映射优先级最高
         if (showSetting?.length) {
           let tvalue = []
@@ -412,7 +413,11 @@ export const outQuickSearchFn = {
           if(df){
             let i = df == 'firstOption' ? 0 : showSetting.findIndex(v => v.change_text == df);
             if(i > -1){
-              tvalue.push(i)
+              if(String(advanceOptionSetting) === '0'){
+                tvalue = i
+              } else {
+                tvalue.push(i)
+              }
             }
           }
           // 存在映射 使用下拉多选框
@@ -553,7 +558,15 @@ export const outQuickSearchFn = {
           temp.value = item.value;
           conObj.push(temp);
         }
+        let advanceOptionSetting = item.advanceOptionSetting;
         if (item.com === "SelectMui" && item.value) {
+          // 单选模式
+          let single = String(advanceOptionSetting) === '0';
+          if(single){
+            if(!Array.isArray(item.value)) {
+              item.value = [item.value]
+            }
+          }
           let hasArr = Array.isArray(item.value) && item.value.length > 0
           if (item.comType == "SelectMuiWordBook" && hasArr) {
             temp.value = item.value.join("|#|");

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
@@ -582,19 +582,28 @@
                       {{ sea.myName }}
                     </a-select-option>
                   </a-select> -->
-                  <multiSelect
-                    v-if="item.con == 'QUOTE'"
-                    :item="item"
-                    source="quickSearch"
-                    :maxTagPlaceholder="maxTagPlaceholder"
-                    :outFilterChange="filterChange"
-                    :handleWordBookSearch="handleSearch"
-                    :dropdownVisibleChange="dropdownVisibleChange"
-                    :fetchingWordbook="fetchingWordbook"
-                  ></multiSelect>
+                  <template  v-if="item.con == 'QUOTE' || item.com == 'SelectMui'">
+                    <c-tree-select
+                      v-if="item.comType === 'treeSelect'"
+                      :item="item"
+                      :handleGetConfigApi="handleGetConfigApi"
+                      style="margin: 0 8px 8px 0"
+                    />
+                    <multiSelect
+                      v-else
+                      :item="item"
+                      source="quickSearch"
+                      :maxTagPlaceholder="maxTagPlaceholder"
+                      :outFilterChange="filterChange"
+                      :handleWordBookSearch="handleSearch"
+                      :dropdownVisibleChange="dropdownVisibleChange"
+                      :fetchingWordbook="fetchingWordbook"
+                    ></multiSelect>
+                  </template>
+
                   <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"
                   />
@@ -728,6 +737,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 +799,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 +855,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 +866,8 @@ export default create({
       parentNames: [],
       showAdd: false,
       addVal: "",
-      fetchingWordbook: false
+      fetchingWordbook: false,
+      ...dataOptions
     };
   },
   watch: {
@@ -971,20 +987,36 @@ export default create({
     setDefaultCon(val) {
       if (!val.length) {
         this.quickSearch.forEach((item, index) => {
-          if (item.CONVERT && Array.isArray(item.CONVERT)) {
-            this.$set(this.quickSearch[index], "CONVERT", []);
-          }
+          let advanceOptionSetting = item?.advanceOptionSetting;
+           //  单选
+           let optionSetting0 =String(advanceOptionSetting) == '0';
+           if(optionSetting0){
+            this.$set(this.quickSearch[index], "value", undefined);
+           } else {
+            if (item.CONVERT && Array.isArray(item.CONVERT)) {
+              this.$set(this.quickSearch[index], "CONVERT", []);
+            }
+           }
+
         });
         return false;
       }
 
       this.quickSearch.forEach((item, index) => {
+        let advanceOptionSetting = item?.advanceOptionSetting;
+        //  单选
+        let optionSetting0 =String(advanceOptionSetting) == '0';
         let find = val.find(valItem => valItem.field_key === item.columnName);
         if (find) {
           let value = find.value.map(item => JSON.stringify(item));
+          value = value.filter(Boolean)
           this.$set(this.quickSearch[index], "CONVERT", value);
+          if(optionSetting0){
+            let i = value[0] ? item.labelList.findIndex(v=> v.value== value[0]) : ""
+            this.$set(this.quickSearch[index], "value", i);
+          }
         } else {
-          this.$set(this.quickSearch[index], "CONVERT", []);
+          this.$set(this.quickSearch[index], "CONVERT",optionSetting0?"": []);
         }
       });
     },
@@ -996,11 +1028,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 = undefined
+            }
             this.$set(el, "con", "QUOTE");
             this.$set(el, "dataSource", []);
             this.$set(el, "QUOTE", []);
@@ -1032,8 +1070,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 +1127,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 +1222,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 +1245,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 +1347,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") {
@@ -1296,6 +1358,15 @@ export default create({
           if (item.EVALUATEAttr) {
             value = item.selecteds.join("|#|");
           }
+        } else if((item.comType == 'SelectMui'&& optionSetting0)){
+          // 单选模式
+          let i = item.value;
+          let c = item?.labelList[i];
+          if (item.con == "CONVERT") {
+           value = c?.filter ? [c?.filter] : undefined
+          } else {
+           value= c?.labelName ? [c?.labelName] : undefined;
+          }
         } else if (item.con == "QUOTE" && !vexutils.isEmpty(item.value)) {
           // value = item.QUOTE.join("|#|");
           if(item.comType == "treeSelect"){
@@ -1311,7 +1382,7 @@ export default create({
               value = cval.join("|#|");
             }
           } else {
-            value = item.value.join("|#|");
+            value = optionSetting0? item.value : item.value.join("|#|");
           }
         } else if (!vexutils.isEmpty(item.CONVERT)) {
           value = item.CONVERT.map(item => {
@@ -1565,16 +1636,22 @@ export default create({
         return;
       }
       arr.forEach(item => {
+        let advanceOptionSetting = item?.advanceOptionSetting;
+          //  单选
+        let optionSetting0  =String(advanceOptionSetting) === '0';
         if (item.EQ || item.CL) {
           item.EQ = "";
           item.CL = "";
         } else if (item.con == "QUOTE" && !vexutils.isEmpty(item.value)) {
           item.QUOTE = [];
           item.value = [];
+        } else if(item.com == 'SelectMui' && item.con == 'CONVERT' && optionSetting0){
+          item.CONVERT = [];
+          item.value = undefined
         } else if (!vexutils.isEmpty(item.CONVERT)) {
           item.CONVERT = [];
         } else if (item.DATE) {
-          item.showDate = false;
+          item.showDate = String(advanceOptionSetting) == '1' ? true: false;
           item.marginx = "ml";
           item.DATE = {
             con: null,