cnhis-design-vue 0.1.96-beta → 0.1.97-beta

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

@@ -336,16 +336,25 @@
                   {{ sea.showKeys || 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'">
+                <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'"
@@ -716,6 +725,7 @@ import resize from 'vue-resize-directive';
 import { durationMixin, $utils, filterApiFn } from '../mixins/mixins';
 import vexutils from '@/utils/vexutils';
 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';
 export default create({
@@ -749,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,
@@ -769,7 +780,8 @@ export default create({
     [Tooltip.name]: Tooltip,
     [Form.Item.name]: Form.Item,
     [Tag.CheckableTag.name]: Tag.CheckableTag,
-    multiSelect
+    multiSelect,
+    cTreeSelect
   },
   computed: {
     showPercent() {
@@ -983,12 +995,16 @@ export default create({
           // el.seting 可能是 string / object
           el.setting = typeof el.setting == "string" ? JSON.parse(el.setting) : el.setting;
           if (!vexutils.isEmpty(el.setting.wordbook)) {
+            let isTree = "tree" === el?.setting?.wordbook?.showType;
+            let comType = isTree ? 'treeSelect' : 'SelectMuiWordBook';
+            let defVal = isTree ? undefined : [];
+
             this.$set(el, "con", "QUOTE");
             this.$set(el, "dataSource", []);
             this.$set(el, "QUOTE", []);
-            this.$set(el, "value", []);
+            this.$set(el, "value", defVal);
             this.$set(el, "com", "SelectMui");
-            this.$set(el, "comType", "SelectMuiWordBook");
+            this.$set(el, "comType", comType);
             this.$set(el, "searchPageConfig", {
               keyword: undefined,
               isRequest: false, // 是否已请求
@@ -1270,7 +1286,15 @@ export default create({
           }
         } else if (item.con == "QUOTE" && !vexutils.isEmpty(item.value)) {
           // value = item.QUOTE.join("|#|");
-          value = item.value.join("|#|");
+          if(item.comType == "treeSelect"){
+            let cval = item.value;
+            if(typeof cval === 'string'){
+              [cval]  = cval.split('<&=&>')
+            }
+            value = cval;
+          } else {
+            value = item.value.join("|#|");
+          }
         } else if (!vexutils.isEmpty(item.CONVERT)) {
           value = item.CONVERT.map(item => {
             if (item && vexutils.isJSON(item)) {

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;