cnhis-design-vue 2.1.79 → 2.1.81

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

@@ -2,15 +2,15 @@ import { WidgetCfgMaps } from '../components/render-widget/widgetCfgMaps';
 import { WidgetTypeEnums, DatePresetValEnums } from '../components/render-widget/enums';
 
 function randomkey() {
-  return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, c => {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
     const r = (Math.random() * 16) | 0;
-    const v = c === "x" ? r : (r & 0x3) | 0x8;
+    const v = c === 'x' ? r : (r & 0x3) | 0x8;
     return v.toString(16);
   });
 }
 
 // 外层换行
-const BlockEle = [WidgetTypeEnums.CHECKBOX_GROUP];
+const BlockEle = [WidgetTypeEnums.CHECKBOX_GROUP, WidgetTypeEnums.DATE_RANGE_QUICK, WidgetTypeEnums.CHECKBOX_GROUP, WidgetTypeEnums.LABEL];
 
 export default {
   methods: {
@@ -33,12 +33,12 @@ export default {
 
       const { widgetType } = cfg.widgetCfg || {};
 
-      this.$set(cfg, "_frontId", randomkey());
-      this.$set(cfg, "isRender", isRender);
-      this.$set(cfg, "widgetType", widgetType);
-      this.$set(cfg, "con", "EQ");
+      this.$set(cfg, '_frontId', randomkey());
+      this.$set(cfg, 'isRender', isRender);
+      this.$set(cfg, 'widgetType', widgetType);
+      this.$set(cfg, 'con', 'EQ');
 
-      if (BlockEle.includes(widgetType)) this.$set(cfg, "_isBlock", true); 
+      if (BlockEle.includes(widgetType)) this.$set(cfg, '_isBlock', true);
 
       this.$set(cfg, 'value', this.getDefValByRenderWidget(cfg));
 
@@ -48,7 +48,7 @@ export default {
       const isRender = this.isRender(cfg);
       if (!isRender) return null;
       const { columnName, con, value, widgetType } = cfg;
-      
+
       let unit = null;
       // 时间组件 unit 设置为自定义
       const dateWidgetTypes = [WidgetTypeEnums.DATE, WidgetTypeEnums.DATE_TIME];
@@ -62,8 +62,8 @@ export default {
         field_key: columnName,
         con,
         value: val.length > 0 ? val : null,
-        unit,
-      }
+        unit
+      };
     },
     getDefValByRenderConObj(conObj, cfg) {
       const isRender = this.isRender(cfg);
@@ -75,15 +75,23 @@ export default {
       }
       return !Array.isArray(value) ? value : value[0];
     },
+    isExplicitDefaultVal(cfg) {
+      const { explicitDefaultVal } = cfg.widgetCfg || {};
+      return explicitDefaultVal === 'firstOption';
+    },
     isExistDefValByRenderWidget(cfg) {
       const { defaultValue, defValueUnit } = cfg.widgetCfg || {};
+      if (this.isExplicitDefaultVal(cfg)) return true;
       return !!(defaultValue || defValueUnit);
     },
     resetRenderWidgetValue(cfg) {
       const isRender = this.isRender(cfg);
       if (!isRender) return isRender;
+      if (cfg.widgetType == 'DATE_RANGE_QUICK') {
+        cfg.con = undefined;
+      }
       cfg.value = undefined;
       return isRender;
     }
-  },
-}
+  }
+};