cnhis-design-vue 2.1.116 → 2.1.119

package/packages/table-filter/src/components/render-widget/widgetCfgMaps.js

@@ -11,9 +11,7 @@ export const WidgetCfgMaps = new Map([
     WidgetTypeEnums.INPUT_NUMBER,
     {
       component: InputNumber,
-      props: {
-        allowClear: true
-      },
+      props: {},
       eventsBySearch: [
         {
           name: 'keydown',
@@ -24,8 +22,9 @@ export const WidgetCfgMaps = new Map([
           }
         }
       ],
-      handlerProps(props, { title } = {}) {
-        const Props = { ...props, placeholder: `请输入${title}` };
+      handlerProps(props, { title, explicitRequired } = {}) {
+        const allowClear = explicitRequired != 1;
+        const Props = { ...props, placeholder: `请输入${title}`, allowClear };
         return Props;
       },
       setDefaultValue: SetDefVal
@@ -35,9 +34,7 @@ export const WidgetCfgMaps = new Map([
     WidgetTypeEnums.INPUT,
     {
       component: Text,
-      props: {
-        allowClear: true
-      },
+      props: {},
       eventsBySearch: [
         {
           name: 'keydown',
@@ -48,8 +45,9 @@ export const WidgetCfgMaps = new Map([
           }
         }
       ],
-      handlerProps(props, { title, isQuick } = {}) {
-        const Props = { ...props, placeholder: `请输入${title}`, isQuick };
+      handlerProps(props, { title, isQuick, explicitRequired } = {}) {
+        const allowClear = explicitRequired != 1;
+        const Props = { ...props, placeholder: `请输入${title}`, isQuick, allowClear };
         return Props;
       },
       setDefaultValue: SetDefVal
@@ -60,7 +58,6 @@ export const WidgetCfgMaps = new Map([
     {
       component: Select,
       props: {
-        allowClear: true,
         options: [],
         showSearch: true,
         mode: 'default',
@@ -77,8 +74,9 @@ export const WidgetCfgMaps = new Map([
           }
         }
       ],
-      handlerProps(props, { valueList, multiple, title } = {}) {
-        const Props = { ...props, placeholder: `请选择${title}` };
+      handlerProps(props, { valueList, multiple, title, explicitRequired } = {}) {
+        const allowClear = explicitRequired != 1;
+        const Props = { ...props, placeholder: `请选择${title}`, allowClear };
         if (Array.isArray(valueList)) Props.options = valueList.map(({ value, label }) => ({ value, label }));
         if (multiple) Props.mode = 'multiple';
         return Props;
@@ -92,11 +90,11 @@ export const WidgetCfgMaps = new Map([
     {
       component: DatePicker,
       props: {
-        allowClear: true,
         valueFormat: 'YYYY-MM-DD HH:mm:ss'
       },
-      handlerProps(props, { title } = {}) {
-        const Props = { ...props, placeholder: `请选择${title}` };
+      handlerProps(props, { title, explicitRequired } = {}) {
+        const allowClear = explicitRequired != 1;
+        const Props = { ...props, placeholder: `请选择${title}`, allowClear };
         return Props;
       },
       setDefaultValue(defaultValue, defValueUnit) {
@@ -112,12 +110,12 @@ export const WidgetCfgMaps = new Map([
     {
       component: DatePicker,
       props: {
-        allowClear: true,
         valueFormat: 'YYYY-MM-DD HH:mm:ss',
         'show-time': { defaultValue: moment('00:00:00', 'HH:mm:ss') }
       },
-      handlerProps(props, { title } = {}) {
-        const Props = { ...props, placeholder: `请选择${title}` };
+      handlerProps(props, { title, explicitRequired } = {}) {
+        const allowClear = explicitRequired != 1;
+        const Props = { ...props, placeholder: `请选择${title}`, allowClear };
         return Props;
       },
       setDefaultValue(defaultValue, defValueUnit) {
@@ -136,8 +134,9 @@ export const WidgetCfgMaps = new Map([
       style: {
         'line-height': '32px'
       },
-      handlerProps(props, { valueList, multiple } = {}) {
-        const Props = { ...props, multiple };
+      handlerProps(props, { valueList, multiple, explicitRequired } = {}) {
+        const allowClear = explicitRequired != 1;
+        const Props = { ...props, multiple, allowClear };
         if (Array.isArray(valueList)) Props.options = valueList.map(({ value, label }) => ({ value, label }));
         return Props;
       },
@@ -149,10 +148,11 @@ export const WidgetCfgMaps = new Map([
     {
       component: NumberRange,
       props: {},
-      handlerProps(props, { valueList, multiple, title, isQuick } = {}) {
+      handlerProps(props, { valueList, multiple, title, isQuick, explicitRequired } = {}) {
+        const allowClear = explicitRequired != 1;
         const placeholderS = isQuick ? '最小值' : `起始${title}`;
         const placeholderE = isQuick ? '最大值' : `截止${title}`;
-        const Props = { ...props, multiple, placeholderS, placeholderE };
+        const Props = { ...props, multiple, placeholderS, placeholderE, allowClear };
         if (Array.isArray(valueList)) Props.options = valueList.map(({ value, label }) => ({ value, label }));
         return Props;
       },
@@ -164,11 +164,11 @@ export const WidgetCfgMaps = new Map([
     {
       component: DatePicker.RangePicker,
       props: {
-        allowClear: true,
         valueFormat: 'YYYY-MM-DD'
       },
-      handlerProps(props, { title } = {}) {
-        const Props = { ...props, placeholder: [`起始${title}`, `截止${title}`] };
+      handlerProps(props, { title, explicitRequired } = {}) {
+        const allowClear = explicitRequired != 1;
+        const Props = { ...props, placeholder: [`起始${title}`, `截止${title}`], allowClear };
         return Props;
       },
       setDefaultValue(defaultValue, defValueUnit) {
@@ -188,12 +188,12 @@ export const WidgetCfgMaps = new Map([
     {
       component: DatePicker.RangePicker,
       props: {
-        allowClear: true,
         valueFormat: 'YYYY-MM-DD HH:mm:ss',
         'show-time': { defaultValue: [moment('00:00:00', 'HH:mm:ss'), moment('23:59:59', 'HH:mm:ss')] }
       },
-      handlerProps(props, { title } = {}) {
-        const Props = { ...props, placeholder: [`起始${title}`, `截止${title}`] };
+      handlerProps(props, { title, explicitRequired } = {}) {
+        const allowClear = explicitRequired != 1;
+        const Props = { ...props, placeholder: [`起始${title}`, `截止${title}`], allowClear };
         return Props;
       },
       setDefaultValue(defaultValue, defValueUnit) {
@@ -213,9 +213,10 @@ export const WidgetCfgMaps = new Map([
     {
       component: DateRangeQuick,
       props: {},
-      handlerProps(props, { fieldType } = {}) {
+      handlerProps(props, { fieldType, explicitRequired } = {}) {
+        const allowClear = explicitRequired != 1;
         let str = fieldType === 'DATE' ? '日期' : '时间';
-        const Props = { ...props, placeholderS: `开始${str}`, placeholderE: `结束${str}`, fieldType };
+        const Props = { ...props, placeholderS: `开始${str}`, placeholderE: `结束${str}`, fieldType, allowClear };
         return Props;
       },
       setDefaultValue: SetDefVal
@@ -237,8 +238,9 @@ export const WidgetCfgMaps = new Map([
           }
         }
       ],
-      handlerProps(props, { multiple, title } = {}) {
-        const Props = { ...props, placeholder: `请选择${title}` };
+      handlerProps(props, { multiple, title, explicitRequired } = {}) {
+        const allowClear = explicitRequired != 1;
+        const Props = { ...props, placeholder: `请选择${title}`, allowClear };
         Props.mode = multiple ? 'multiple' : 'default';
         return Props;
       },
@@ -250,8 +252,9 @@ export const WidgetCfgMaps = new Map([
     {
       component: Label,
       props: {},
-      handlerProps(props) {
-        const Props = { ...props };
+      handlerProps(props, { explicitRequired } = {}) {
+        const allowClear = explicitRequired != 1;
+        const Props = { ...props, allowClear };
         return Props;
       },
       setDefaultValue(defaultValue, defValueUnit) {
@@ -267,13 +270,13 @@ export const WidgetCfgMaps = new Map([
     {
       component: SelectLabel,
       props: {
-        allowClear: true,
         showSearch: true,
         mode: 'default',
         showArrow: true
       },
-      handlerProps(props, { multiple, title } = {}) {
-        const Props = { ...props, placeholder: `请选择${title}` };
+      handlerProps(props, { multiple, title, explicitRequired } = {}) {
+        const allowClear = explicitRequired != 1;
+        const Props = { ...props, placeholder: `请选择${title}`, allowClear };
         Props.mode = multiple ? 'multiple' : 'default';
         return Props;
       },

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

@@ -455,6 +455,83 @@ export const outQuickSearchDefCommon = {
 export const outQuickSearchFn = {
   mixins: [renderWidget],
   methods: {
+    isFieldFilterField(columnName) {
+      return this.originFieldList.find(v => {
+        const filterField = this.tableDataType === 'API' ? v.filterSettingMap?.filterField : v.fieldSetting?.mapping?.type === 'manual' && v.isMerge != 1 && v.notParticipatingSearch != 1;
+        return filterField && v.columnName === columnName;
+      });
+    },
+    clearOutSearchItem(item, index) {
+      if (this.isRender(item)) {
+        this.$set(this.outSearchFieldList[index], 'value', this.getDefValByRenderWidget(item));
+        return;
+      }
+      let advanceOptionSetting = item?.advanceOptionSetting;
+      //  单选
+      let optionSetting0 = String(advanceOptionSetting) == '0';
+      if (optionSetting0) {
+        this.$set(this.outSearchFieldList[index], 'value', undefined);
+      } else {
+        if (item.CONVERT && Array.isArray(item.CONVERT)) {
+          this.$set(this.outSearchFieldList[index], 'CONVERT', []);
+        }
+        this.$set(this.outSearchFieldList[index], 'value', []);
+      }
+    },
+    setOutSearchItem(item, index, find) {
+      if (this.isRender(item)) {
+        this.$set(this.outSearchFieldList[index], 'value', this.getDefValByRenderConObj(find, item));
+        return;
+      }
+      let optionSetting0 = String(item.advanceOptionSetting) == '0';
+
+      let value = find?.value ?? '';
+      let isTrance = (item.CONVERT && Array.isArray(item.CONVERT)) || (item.comType == 'SelectMui' && item.con == 'CONVERT');
+      // wordbook多选
+      let isWordBookMulti = value && item.comType === 'SelectMuiWordBook' && typeof value === 'string' && value.includes('|#|');
+      if (isWordBookMulti) {
+        value = value.split('|#|');
+      }
+      if (Array.isArray(value) && isTrance) {
+        let value = find?.value?.map?.(item => JSON.stringify(item)) || find.value;
+        value = value.filter(Boolean);
+        this.$set(this.outSearchFieldList[index], 'CONVERT', value);
+        if (value.length) {
+          if (optionSetting0) {
+            let i = value[0] ? item.labelList.findIndex(v => v.value == value[0]) : '';
+            this.$set(this.outSearchFieldList[index], 'value', i);
+          } else {
+            let resVal = [];
+            item.labelList?.forEach((v, i) => {
+              if (value.includes(v.value)) {
+                resVal.push(i);
+              }
+            });
+            resVal.length && this.$set(this.outSearchFieldList[index], 'value', resVal);
+          }
+        }
+      } else {
+        this.$set(this.outSearchFieldList[index], 'value', value);
+      }
+    },
+    setOutDefaultCon(val, headerFilterFieldList) {
+      // 表头筛选/高级筛选 -> 同步到筛选外显中
+      if (!this.outSearchFieldList?.length || !this.originFieldList?.length) return;
+      headerFilterFieldList.forEach(h => {
+        let hKey = h.filterSettingMap?.filterField && h.filterSettingMap?.headerFilterKey;
+        if (!hKey) return;
+        let mItem = this.outSearchFieldList.find(o => o.columnName === hKey);
+        if (!mItem) return;
+        let mHeader = val?.length && val.find(v => v.field_key === hKey);
+        let oIndex = this.outSearchFieldList.findIndex(c => c.columnName === hKey);
+        let oItem = this.outSearchFieldList[oIndex];
+        if (mHeader) {
+          this.setOutSearchItem(oItem, oIndex, mHeader);
+        } else {
+          this.clearOutSearchItem(oItem, oIndex);
+        }
+      });
+    },
     handlerInitSearchItem(arr) {
       if (!Array.isArray(arr)) return;
       arr.forEach(el => {
@@ -504,6 +581,7 @@ export const outQuickSearchFn = {
           this.$set(el, 'value', tvalue);
           const labelList = el.setting?.showSetting.map(i => {
             i.labelName = i.change_text;
+            i.value = i.filter && JSON.stringify(i.filter);
             return i;
           });
           this.$set(el, 'labelList', labelList);
@@ -576,6 +654,7 @@ export const outQuickSearchFn = {
             if (attr == 'EVALUATE') {
               let list = EVALUATEList.map(i => {
                 i.labelName = i.label;
+                i.value = i.filter && JSON.stringify(i.filter);
                 return i;
               });
               this.$set(el, 'labelList', list);
@@ -638,21 +717,25 @@ export const outQuickSearchFn = {
           temp.value = item.value;
           conObj.push(temp);
         }
+
+        let useValue = item.value ?? '';
+
         let advanceOptionSetting = item.advanceOptionSetting;
-        if (item.com === 'SelectMui' && vexutils.anyNotEmpty(item.value)) {
+        if (item.com === 'SelectMui' && vexutils.anyNotEmpty(useValue)) {
           // 单选模式
           let single = String(advanceOptionSetting) === '0';
           if (single) {
-            if (!Array.isArray(item.value)) {
-              item.value = [item.value];
+            if (!Array.isArray(useValue)) {
+              useValue = [useValue];
+              temp.value = useValue;
             }
           }
-          let hasArr = Array.isArray(item.value) && item.value.length > 0;
+          let hasArr = Array.isArray(useValue) && useValue.length > 0;
           if (item.comType == 'SelectMuiWordBook' && hasArr) {
-            temp.value = item.value.join('|#|');
+            temp.value = useValue.join('|#|');
           } else if (item.comType == 'treeSelect') {
             // 樹狀
-            let value = item.value;
+            let value = useValue;
             if (typeof value === 'string') {
               [value] = value.split('<&=&>');
             } else if (Array.isArray(value)) {
@@ -666,7 +749,7 @@ export const outQuickSearchFn = {
           } else if (item.settingObj.attr === 'EVALUATE') {
             if (hasArr) {
               let value = [];
-              value = item.value.map(i => {
+              value = useValue.map(i => {
                 return item.labelList[i].value;
               });
               temp.value = value.join('|#|');
@@ -676,13 +759,13 @@ export const outQuickSearchFn = {
               if (item.con == 'CONVERT') {
                 // 存在映射
                 let value = [];
-                value = item.value.map(i => {
+                value = useValue.map(i => {
                   return item.labelList[i].filter;
                 });
                 temp.value = value;
               } else {
                 let value = [];
-                value = item.value.map(i => {
+                value = useValue.map(i => {
                   return item.labelList[i].labelName;
                 });
                 temp.value = value.join('|#|');
@@ -691,9 +774,9 @@ export const outQuickSearchFn = {
           }
           conObj.push(temp);
         }
-        if (item.com === 'DatePicker' && item.value.length) {
-          const start_val = item.value[0].format(item.showFormat);
-          const end_val = item.value[1].format(item.showFormat);
+        if (item.com === 'DatePicker' && useValue.length) {
+          const start_val = useValue[0].format(item.showFormat);
+          const end_val = useValue[1].format(item.showFormat);
           if (item.settingObj.attr === 'BIRTHDAY') {
             temp.limit_date = `${start_val}~${end_val}`;
           } else {
@@ -702,9 +785,9 @@ export const outQuickSearchFn = {
           }
           conObj.push(temp);
         }
-        if (item.com === 'DayPicker' && item.value) {
-          const start_val = item.value.startOf('day').format('YYYY-MM-DD HH:mm:ss');
-          const end_val = item.value.endOf('day').format('YYYY-MM-DD HH:mm:ss');
+        if (item.com === 'DayPicker' && useValue) {
+          const start_val = useValue.startOf('day').format('YYYY-MM-DD HH:mm:ss');
+          const end_val = useValue.endOf('day').format('YYYY-MM-DD HH:mm:ss');
           if (item.settingObj.attr === 'BIRTHDAY') {
             temp.limit_date = `${start_val}~${end_val}`;
           } else {
@@ -738,8 +821,8 @@ export const outQuickSearchFn = {
           temp.con = 'EQ';
           conObj.push(JSON.parse(JSON.stringify(temp)));
         }
-        if (item.com === 'SelectQuote' && item.value.length) {
-          temp.value = item.value.join('|#|');
+        if (item.com === 'SelectQuote' && useValue.length) {
+          temp.value = useValue.join('|#|');
           conObj.push(temp);
         }
       });

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

@@ -990,27 +990,29 @@ export default create({
       });
       this.parentNames = parentNames;
     },
+    clearQuickItem(item, index) {
+      if (this.isRender(item)) {
+        this.$set(this.quickSearch[index], "value", this.getDefValByRenderWidget(item));
+        return;
+      }
+
+      let advanceOptionSetting = item?.advanceOptionSetting;
+      //  单选
+      let optionSetting0 =String(advanceOptionSetting) == '0';
+      let settingLen = item.setting?.showSetting?.length;
+      let isCheck = optionSetting0 && settingLen && settingLen < 10;
+      if(optionSetting0 && !isCheck){
+        this.$set(this.quickSearch[index], "value", undefined);
+      } else {
+        if (item.CONVERT && Array.isArray(item.CONVERT)) {
+          this.$set(this.quickSearch[index], "CONVERT", []);
+        }
+      }
+    },
     setDefaultCon(val) {
       if (!val.length) {
         this.quickSearch.forEach((item, index) => {
-          if (this.isRender(item)) {
-            this.$set(this.quickSearch[index], "value", this.getDefValByRenderWidget(item));
-            return;
-          }
-
-          let advanceOptionSetting = item?.advanceOptionSetting;
-           //  单选
-           let optionSetting0 =String(advanceOptionSetting) == '0';
-           let settingLen = item.setting?.showSetting?.length;
-           let isCheck = optionSetting0 && settingLen && settingLen < 10;
-           if(optionSetting0 && !isCheck){
-            this.$set(this.quickSearch[index], "value", undefined);
-           } else {
-            if (item.CONVERT && Array.isArray(item.CONVERT)) {
-              this.$set(this.quickSearch[index], "CONVERT", []);
-            }
-           }
-
+          this.clearQuickItem(item, index)
         });
         return false;
       }
@@ -1045,7 +1047,7 @@ export default create({
              this.$set(this.quickSearch[index], "value", value);
           }
         } else {
-          this.$set(this.quickSearch[index], "CONVERT",optionSetting0?"": []);
+          this.clearQuickItem(item, index)
         }
       });
     },
@@ -1315,27 +1317,30 @@ export default create({
       this.resetChangeWindow();
 
       if (!this.validConObj(mergeConObj, this.searchFieldList, this.searchFieldLimit)) return false;
-      this.$emit("onSave", mergeConObj);
+      this.$emit("onSave", mergeConObj, false, [], [], { isQuickSearch: true });
       return this.quickSearch;
     },
     // 方便外部调用
     getMergeConObj() {
       let conObj = this.getConObjParams() || [];
       let mergeConObj = [...conObj];
-      // 合并表格表头未设置高级筛选的筛选项
-      this.quickSearchConfig.forEach(i => {
-        let find = mergeConObj.find(j => {
-          return i.field_key === j.field_key;
+      // 兼容二次开发平台逻辑
+      if(this.libSource != 'lowCode') {
+        // 合并表格表头未设置高级筛选的筛选项
+        this.quickSearchConfig.forEach(i => {
+          let find = mergeConObj.find(j => {
+            return i.field_key === j.field_key;
+          });
+          if (
+            !find &&
+            !this.quickSearch.find(item => {
+              return item.columnName === i.field_key;
+            })
+          ) {
+            mergeConObj.push(i);
+          }
         });
-        if (
-          !find &&
-          !this.quickSearch.find(item => {
-            return item.columnName === i.field_key;
-          })
-        ) {
-          mergeConObj.push(i);
-        }
-      });
+      }
       return mergeConObj || [];
     },
     getConObjParams() {

package/packages/fabric-chart/src/mixins/type.js

@@ -1,6 +0,0 @@
-export const isNumber = num => {
-  return typeof num === 'number' && Number.isFinite(num);
-};
-export const isObject = obj => {
-  return Object.prototype.toString.call(obj) === '[object Object]';
-};