cnhis-design-vue 0.1.91-beta → 0.1.95-beta

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

@@ -35,6 +35,7 @@
   </template>
 
     <a-range-picker
+      :allowClear="item.explicitRequired != 1"
       :format="item.showFormat"
       @change="value => rangePickerChange(value, item)"
       @ok="outFilterChange"
@@ -101,7 +102,8 @@ import multiSelect from '../multi-select/multi-select';
 import cTreeSelect from '../c-tree-select/tree-select';
 import { filterApiFn } from '../../mixins/mixins';
 import wordBookutils from '../../mixins/wordBookutils';
-
+import moment from 'moment';
+import {  DatePicker} from 'ant-design-vue';
 const EVALUATEList = [
   {
     label: "一星",
@@ -132,13 +134,15 @@ const EVALUATEList = [
 export default {
   name: "OutQuickSearch",
   mixins: [filterApiFn],
-  components: { multiSelect,cTreeSelect },
+  components: { multiSelect,cTreeSelect,    [DatePicker.RangePicker.name]: DatePicker.RangePicker },
   props: {
     item: Object
   },
   data() {
     return {
-      fetchingWordbook: false
+      fetchingWordbook: false,
+      initSearch: false,
+      curDefaultValue: null,
     };
   },
 
@@ -147,7 +151,7 @@ export default {
       return function(item) {
         if (!item.showTime) return false;
         return {
-          defaultValue: [this.$moment("00:00:00", "HH:mm:ss"), this.$moment("23:59:59", "HH:mm:ss")]
+          defaultValue: [moment("00:00:00", "HH:mm:ss"), moment("23:59:59", "HH:mm:ss")]
         };
       };
     }
@@ -190,6 +194,10 @@ export default {
         if (item.settingObj.wordbook) {
           obj.autograph = item.settingObj.wordbook.autograph;
         }
+        let df = item.explicitDefaultVal;
+        if(df != 'firstOption'){
+          obj.keyword = df;
+        }
         this.getWordbookData(item.setting.wordbook, obj).then(({ data }) => {
           this.handleWordbookData(item, data, obj);
         });
@@ -201,6 +209,25 @@ export default {
       this.$set(item, "hasFieldList", hasFieldList);
       this.$set(item, "dataSource", rows);
       item.searchPageConfig = Object.assign(item.searchPageConfig, searchPageConfig);
+      // 初始化获取值
+      if(!this.initSearch){
+        let df = item.explicitDefaultVal;
+        if(df){
+          let defval = [];
+          if(df === 'firstOption'){
+           let [v] = rows;
+           v && (defval = [v.myName])
+          } else {
+            let f = rows.find(v => v.myName.includes(df));
+            if(f){
+              defval = [f.myName]
+            }
+          }
+          item.value = [...defval]
+          item.search_DefaultValue= [...defval]
+        }
+        this.initSearch = true;
+      }
     },
     getWordbookData(o, obj) {
       let { id, filterKeys, wordbookType } = o;

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

@@ -33,7 +33,7 @@ const EVALUATEList = [
 ];
 
 import moment from 'moment';
-
+import timeDomain from '@/utils/time-domain';
 export const durationMixin = {
   filters: {
     // 格式化时长单位
@@ -383,13 +383,23 @@ export const outQuickSearchFn = {
       arr.forEach(el => {
         el.setting = typeof el.setting == "string" ? JSON.parse(el.setting) : el.setting;
         const attr = el?.settingObj?.attr || "";
+        const showSetting = el?.setting?.showSetting || []
         // 映射优先级最高
-        if (el.setting?.showSetting?.length) {
+        if (showSetting?.length) {
+          let tvalue = []
+          // 设置了默认值
+          let df = el.explicitDefaultVal;
+          if(df){
+            let i = df == 'firstOption' ? 0 : showSetting.findIndex(v => v.change_text == df);
+            if(i > -1){
+              tvalue.push(i)
+            }
+          }
           // 存在映射 使用下拉多选框
           this.$set(el, "con", "CONVERT");
           this.$set(el, "com", "SelectMui");
           this.$set(el, "comType", "SelectMui");
-          this.$set(el, "value", []);
+          this.$set(el, "value", tvalue);
           const labelList = el.setting.showSetting.map(i => {
             i.labelName = i.change_text;
             return i;
@@ -431,7 +441,18 @@ export const outQuickSearchFn = {
             ["DATETIME", "DATE"].includes(el.fieldType)
           ) {
             // 查找默认值
-            const value = this.getSearchDefValueByLimit(el, this.searchFieldLimit) || [];
+            let value = this.getSearchDefValueByLimit(el, this.searchFieldLimit) || [];
+            // explicitDefaultVal: "YESTERDAY"
+            // explicitRequired: 1
+
+            // 配置了默认值
+            if(el.explicitDefaultVal){
+              // let showFormat = attr === "BIRTHDAY" ? 'MM-DD':'YYYY-MM-DD HH:mm:ss';
+              let t = timeDomain.getTimeDomain(el.explicitDefaultVal)
+              if(t.length > 0){
+                value = t;
+              }
+            }
             this.$set(el, "con", "IN");
             this.$set(el, "com", "DatePicker");
             this.$set(el, "value", value);

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

@@ -759,6 +759,7 @@ export default create({
     [Select.Option.name]: Select.Option,
     [Upload.name]: Upload,
     [DatePicker.name]: DatePicker,
+    [DatePicker.RangePicker.name]: DatePicker.RangePicker,
     [Input.name]: Input,
     [Input.Group.name]: Input.Group,
     [InputNumber.name]: InputNumber,

package/src/utils/time-domain.js

@@ -0,0 +1,193 @@
+import moment from 'moment';
+
+const TYPELIST = [
+  { name: 'TODAY', desc: '今天' },
+  { name: 'TOMORROW', desc: '明天' },
+  { name: 'YESTERDAY', desc: '昨天' },
+  { name: 'THIS_WEEK', desc: '本周' },
+  { name: 'NEXT_WEEK', desc: '下周' },
+  { name: 'UP_WEEK', desc: '上周' },
+  { name: 'THIS_MONTH', desc: '本月' },
+  { name: 'NEXT_MONTH', desc: '下月' },
+  { name: 'UP_MONTH', desc: '上月' },
+  { name: 'THIS_SEASON', desc: '本季度' },
+  { name: 'NEXT_SEASON', desc: '下季度' },
+  { name: 'UP_SEASON', desc: '上季度' },
+  { name: 'THIS_YEAR', desc: '本年' },
+  { name: 'NEXT_YEAR', desc: '下年' },
+  { name: 'UP_YEAR', desc: '上年' }
+];
+
+const defaultType = 'YYYY-MM-DD HH:mm:ss';
+
+/*
+  moment().format('X') // （大写X）以秒为单位，返回值为字符串类型
+  moment().format('x') // （小写x）以毫秒为单位，返回值为字符串类型
+  moment().valueOf()   //   以毫秒为单位，返回值为数值型
+*/
+
+const timeDomain = {
+  TODAY() {
+    const start = moment().startOf('day');
+    const end = moment().endOf('day');
+    return [start, end];
+  },
+
+  TOMORROW() {
+    // moment().add(7, "days");
+    const start = moment()
+      .add(1, 'days')
+      .startOf('days');
+    const end = moment()
+      .add(1, 'days')
+      .endOf('days');
+    return [start, end];
+  },
+
+  YESTERDAY() {
+    const start = moment()
+      .subtract(1, 'days')
+      .startOf('days');
+    const end = moment()
+      .subtract(1, 'days')
+      .endOf('days');
+    return [start, end];
+  },
+
+  THIS_WEEK() {
+    const start = moment().startOf('week');
+    const end = moment().endOf('week');
+    return [start, end];
+  },
+
+  NEXT_WEEK() {
+    return timeDomain.getNextWeek(1);
+  },
+
+  UP_WEEK() {
+    return timeDomain.getLastWeek(1);
+  },
+
+  THIS_MONTH() {
+    return timeDomain.getMonth(0);
+  },
+
+  NEXT_MONTH() {
+    return timeDomain.getMonth(1);
+  },
+
+  UP_MONTH() {
+    return timeDomain.getMonth(-1);
+  },
+
+  THIS_SEASON() {
+    return timeDomain.getQuarter(0);
+  },
+
+  NEXT_SEASON() {
+    return timeDomain.getQuarter(1);
+  },
+
+  UP_SEASON() {
+    return timeDomain.getQuarter(-1);
+  },
+
+  THIS_YEAR() {
+    return timeDomain.getYear(0);
+  },
+
+  UP_YEAR() {
+    return timeDomain.getYear(-1);
+  },
+
+  NEXT_YEAR() {
+    return timeDomain.getYear(1);
+  },
+
+  getMonth(difference = 0) {
+    let c_mouth = moment().month() + difference;
+
+    const start = moment()
+      .month(c_mouth)
+      .startOf('month');
+
+    const end = moment()
+      .month(c_mouth)
+      .endOf('month');
+
+    return [start, end];
+  },
+
+  getQuarter(difference = 0) {
+    let c_mouth = moment().quarter() + difference;
+    const start = moment()
+      .quarter(c_mouth)
+      .startOf('quarter');
+    const end = moment()
+      .quarter(c_mouth)
+      .endOf('quarter');
+
+    return [start, end];
+  },
+
+  getYear(difference = 0) {
+    let c_year = moment().year() + difference;
+    const start = moment()
+      .year(c_year)
+      .startOf('year');
+    const end = moment()
+      .year(c_year)
+      .endOf('year');
+    return [start, end];
+  },
+
+  /**
+   * 获取前 i 周的周一和周日日期，并以数组的方式返回。
+   * 当 i=1，获取的是上周一和上周日的日期；
+   * 当 i=2，获取的是上上周一和上上周日的日期
+   * ...以此类推
+   * @param i
+   */
+  getLastWeek(i) {
+    let weekOfDay = parseInt(moment().format('E')); // 计算今天是这周第几天
+    let last_monday = moment()
+      .subtract(weekOfDay + 7 * i - 1, 'days')
+      .startOf('days');
+    let last_sunday = moment()
+      .subtract(weekOfDay + 7 * (i - 1), 'days')
+      .endOf('days');
+    return [last_monday, last_sunday];
+  },
+
+  /**
+   * 获取后 i 周的周一和周日日期，并以数组的方式返回。
+   * 当 i=1，获取的是下周一和下周日的日期；
+   * 当 i=2，获取的是下下周一和下下周日的日期
+   * ...以此类推
+   * @param i
+   */
+  getNextWeek(i) {
+    let weekOfDay = parseInt(moment().format('E')); // 计算今天是这周第几天
+    let next_monday = moment()
+      .add(7 - weekOfDay + 7 * (i - 1) + 1, 'days')
+      .startOf('days');
+    let next_sunday = moment()
+      .add(7 - weekOfDay + 7 * i, 'days')
+      .endOf('days');
+    return [next_monday, next_sunday];
+  },
+
+  getTimeDomain(type, format) {
+    if (timeDomain[type]) {
+      let res =  timeDomain[type]();
+      if(typeof format === 'string'){
+        return res.map(v => v.format(type))
+      }
+      return res;
+    } else {
+      return [];
+    }
+  }
+};
+
+export default timeDomain;