cnhis-design-vue 0.1.93-beta → 0.1.97-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "0.1.93-beta",
+  "version": "0.1.97-beta",
   "description": "基于 Ant Desgin Vue 的UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -93,4 +93,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

package/packages/button/src/ButtonPrint/components/IdentityVerification.vue

@@ -57,7 +57,11 @@ export default {
     },
     identityVerificationTitle: {
       type: String
-    }
+    },
+    printConfig: {
+      type: Object,
+      default: () => ({})
+    },
   },
   components: {
     AModal: Modal
@@ -81,10 +85,18 @@ export default {
       .use(Input);
   },
   mounted() {
-    httpFn = axios.create({
-      withCredentials: false,
-      timeout: 5000
-    });
+      let config = {
+        withCredentials: false,
+        timeout: 5000
+      };
+      let printUrlPrefix = this?.printConfig?.printUrlPrefix;
+      if (axios !== this.axios && printUrlPrefix) {
+        config.baseURL = printUrlPrefix;
+      }
+      httpFn = axios.create({
+        ...config
+      });
+
   },
   watch: {
     visible(val) {

package/packages/button/src/ButtonPrint/index.vue

@@ -28,6 +28,7 @@
     </a-dropdown>
 
     <IdentityVerification
+      :printConfig="printConfig"
       :baseUrl="baseUrl"
       :verifyUserUrl="verifyUserUrl"
       :visible.sync="identityVerification.visible"

package/packages/table-filter/src/base-search-com/BaseSearch.vue

@@ -8,28 +8,17 @@
               设置
               <!-- {{ $t("1.1.5.3") }} -->
             </a-button>
-            <template v-if="showViewList">
-              <a-popover v-model="viewListVisible" placement="bottom" overlayClassName="product-line-popover viewList-popover" >
-                <a-button class="viewList-button">
-                  <svg-icon :icon-class="'anniuqiehuanmoshi'" style="font-size: 22px"></svg-icon>
-                </a-button>
-                <template slot="content">
-                  <ul class="product-line-list">
-                    <li
-                      v-for="(item, index) in viewList"
-                      :value="item.id"
-                      :key="index"
-                      @click="handlerSelectTemp(item.id)"
-                      class="product-line-list-item"
-                      :class="{ 'active': currentTempId === item.id }"
-                    >
-                      <span>{{ item.name }}</span>
-                      <a-icon v-if="currentTempId === item.id" type="check" class="check-icon product-line-check-icon" />
-                    </li>
-                  </ul>
-                </template>
-              </a-popover>
-            </template>
+            <a-dropdown overlayClassName="viewList-dropdown" v-if="showViewList">
+              <a-button class="viewList-button">
+                <svg-icon :icon-class="'anniuqiehuanmoshi'" style="font-size: 22px"></svg-icon>
+              </a-button>
+              <a-menu slot="overlay">
+                <a-menu-item v-for="(item, index) in viewList" :value="item.id" :key="index" @click="handlerSelectTemp(item.id)" :class="{ 'menu-active': currentTempId === item.id }">
+                  <span>{{ item.name }}</span>
+                  <!-- <a-icon v-if="currentTempId === item.id" type="check" /> -->
+                </a-menu-item>
+              </a-menu>
+            </a-dropdown>
           </div>
           <slot name="classification"></slot>
           <li v-if="isShowSetting('hideQuickSearch') && isRelatedSearchFold" ref="quickSearchLi">
@@ -88,7 +77,7 @@
           <li v-if="showResetFilterBtn">
             <a-button @click="handleReset" style="margin: 0 8px 8px 0">
               <svg-icon icon-class="xitongtubiaoliebiaocaozuoanniushanchu" style="margin-right: 6px"></svg-icon>
-              清空
+              重置
             </a-button>
           </li>
 
@@ -771,8 +760,7 @@ export default create({
       groupBtnObj: {},
       btnObj: BTNOBJ,
       printBtnStrategys: [], // 打印按钮组策略list
-      outRelationQuickSearch: [], // 关联表 筛选外显
-      viewListVisible: false
+      outRelationQuickSearch: [] // 关联表 筛选外显
     };
   },
   created() {
@@ -1195,7 +1183,6 @@ export default create({
     },
     handlerSelectTemp(e) {
       if (this.currentTempId === e) return;
-      this.viewListVisible = false;
       this.currentTempId = e;
       const tab = e == 0 ? 'bigTable' : null;
       this.$emit('handlerChangeView', e, tab);
@@ -1521,7 +1508,7 @@ export default create({
       this.$emit('pubResetCheckStatus');
     },
     handleReset() {
-      this.$emit('handleReset');
+      this.$emit('handleReset',{targetType: "outQuickSearchReset" });
     },
     handleUploadChange(info) {
       const { file, fileList } = info;
@@ -1606,7 +1593,7 @@ export default create({
       let params = { type: v, pageSize: 10000 };
       return this.axios.get('/label/list', { params: params });
     },
-    initOutSearchFieldList() {
+    initOutSearchFieldList(config = {}) {
       this.outSearchFieldList = [];
       this.outRelationQuickSearch = [];
       let mySearchFieldList = JSON.parse(JSON.stringify(this.searchFieldList)).filter(i => i.isShowSearch == 1 && i.filterExplicit == 1);
@@ -1639,6 +1626,14 @@ export default create({
       if (this.lastOutRelationQuickSearch.length) {
         this.outRelationQuickSearch = this.$utils.clone(this.lastOutRelationQuickSearch, true);
       }
+
+      // 如有配置默认值
+      if(this.outSearchFieldList.some(v => !!v.explicitDefaultVal)){
+        this.$emit('outSearchInit');
+        if('reset' != config?.type){
+          this.outFilterChange();
+        }
+      }
     },
     dealOutFilterHideBtn() {
       if (!this.isShowSetting('buttonAdaption') && this.outSearchFieldList.length > 0) {
@@ -1875,6 +1870,21 @@ export default create({
       }
       this.setSaveRowStatus(true);
     },
+
+    /**
+     * 获取外显检索的默认值设置
+     */
+    handleGetOutSearchInitValue(){
+
+      if(this.outSearchFieldList.some(v => !!v.explicitDefaultVal)){
+        let conObj = this.getConObjParams() || [];
+        return conObj
+        }
+
+      return []
+    },
+
+
     inlineEditCancel() {
       // 批量编辑
       if (this.isBatchEditing) {
@@ -2294,7 +2304,27 @@ export default create({
     }
   }
 }
-.viewList-popover {
+.viewList-dropdown {
   min-width: 120px;
+  .ant-dropdown-menu-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    color: #2e2e2e;
+    margin: 1px 0;
+    &:hover {
+      background: #f2f2f2;
+    }
+    > span {
+      display: inline;
+      width: 85%;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      overflow: hidden;
+    }
+  }
+  .ant-dropdown-menu-item.menu-active {
+    color: #2d7aff;
+  }
 }
 </style>

package/packages/table-filter/src/components/c-tree-select/tree-select.vue

@@ -0,0 +1,198 @@
+<template>
+  <a-tree-select
+    v-model="item.value"
+    dropdownClassName="c-a-tree-select-container"
+    @select="treeSelect"
+    showSearch
+    style="width: 160px"
+    :dropdown-style="{ maxHeight: '200px', overflow: 'auto' }"
+    :tree-data="treeData"
+    allowClear
+    treeNodeFilterProp="title"
+    :placeholder="`请选择${item.alias || item.title}`"
+  >
+    <span class="init-key-loading" v-if="key === '_init_key_'" slot="title" slot-scope="{ key, value }" style="color: #08c">
+      <span v-show="false">{{ value }}</span>
+      <a-spin :tip="`加载中...`" />
+    </span>
+  </a-tree-select>
+</template>
+
+<script>
+import { TreeSelect, Spin, Icon } from 'ant-design-vue';
+import vexutils from '@/utils/vexutils';
+export default {
+  name: 'cTreeSelect',
+  data() {
+    return {
+      treeData: [
+        {
+          // title: "_init_key_",
+          value: '_init_key_',
+          key: '_init_key_',
+          selectable: false,
+          scopedSlots: {
+            title: 'title'
+          }
+        }
+      ]
+    };
+  },
+  props: {
+    item: {
+      type: Object,
+      default: () => ({ value: '' })
+    },
+    handleGetConfigApi: {
+      type: Function,
+      default: () => {}
+    }
+  },
+  computed: {},
+  watch: {},
+  beforeCreate() {},
+  created() {},
+  beforeMount() {},
+  mounted() {
+    this.init();
+  },
+  beforeUpdate() {},
+  updated() {},
+  beforeDestroy() {},
+  destroyed() {},
+  activated() {},
+  methods: {
+    async init() {
+      try {
+        let res = await this.handleRequestedOptions(this.item);
+        let { result, map } = res.data;
+        if (result !== 'SUCCESS') {
+          this.treeData = [];
+          return;
+        }
+        let rows = map.rows || [];
+        if (rows) {
+          this.handleInitTreeData(rows, this.item);
+          this.treeData = rows;
+        }
+      } catch (error) {
+        console.log(error);
+        this.treeData = [];
+      } finally {
+        this.hanldeSetTreeDef();
+      }
+    },
+
+    async handleRequestedOptions(item = {}) {
+      let params = this.getSearchDefParams(item);
+      let res = await this.handleGetConfigApi(params, 'requestGetWordbookData', { fields: item });
+      return res;
+    },
+
+    getSearchDefParams(item = {}) {
+      let obj = {};
+      let { params = [], autograph, filterKeys, id, wordbookType } = item?.settingObj?.wordbook || {};
+      if (params) {
+        params.forEach(item => {
+          obj[item.p_name] = item.p_value;
+        });
+      }
+      if (autograph) {
+        obj.autograph = autograph;
+      }
+      let resFieldKeys = Array.isArray(filterKeys) ? JSON.stringify(filterKeys) : filterKeys;
+      let res = {
+        wordbookId: id,
+        fieldKeys: resFieldKeys,
+        wordbookType: wordbookType || 'WORDBOOK',
+        isLevelLazyLoad: false,
+        ...obj
+      };
+
+      return res;
+    },
+
+    /* 解析下拉选择接口返回字段 */
+    formatField(value, key) {
+      let res = value;
+      try {
+        if (res && typeof res == 'string' && res.startsWith('###')) {
+          res = res.slice(3);
+          res = JSON.parse(res);
+          res = res.change_text;
+        }
+
+        return res || '';
+      } catch (error) {
+        return '';
+      }
+    },
+
+    hanldeGetCascadelabel(v = [], k = {}) {
+      if (Array.isArray(v) && v.length) {
+        const l = [];
+        v.forEach(i => {
+          let res = this.formatField(k[i]);
+          l.push(res);
+        });
+        if (l.length == 0) {
+          return '';
+        }
+        return l.join(' ');
+      }
+      return '';
+    },
+
+    handleInitTreeData(list = [], config = {}) {
+      let { showKeys = [], field_key } = config?.setting?.wordbook || {};
+      list.forEach((item,i) => {
+        let val = vexutils.stringToValue(item[field_key], 'value');
+        item.myLabel = this.hanldeGetCascadelabel(showKeys, item) || val;
+        item.key = item.theUniqueKey;
+        item.title = item.myLabel;
+        // 避免接口配置的value 不知唯一值，导致前端页面卡死
+        item.value = `${val}<&=&>${i}<&=&>${item.key}`;
+        // item.scopedSlots = {
+        //   title: "title"
+        // };
+
+        if (item.children && item.children.length) {
+          this.handleInitTreeData(item.children, config);
+        }
+      });
+    },
+
+    hanldeSetTreeDef() {},
+
+    treeSelect(key, vnode) {}
+  },
+  components: {
+    [TreeSelect.name]: TreeSelect,
+    [Spin.name]: Spin,
+    [Icon.name]: Icon
+  }
+};
+</script>
+
+<style lang="less">
+.c-a-tree-select-container {
+  .ant-select-tree-title {
+    display: inline-block;
+    width: 100%;
+  }
+
+  .init-key-loading {
+    display: flex;
+    justify-content: center;
+    width: 100%;
+  }
+
+  .ant-select-tree {
+    li.filter-node {
+      > span {
+        font-weight: 600;
+      }
+    }
+  }
+}
+</style>

package/packages/table-filter/src/components/multi-select/multi-select.vue

@@ -13,12 +13,13 @@
     @search="handleWordBookSearch($event, item)"
     @dropdownVisibleChange="dropdownVisibleChange($event, item)"
     class="quick-input-select"
-    allowClear
+    :allowClear="item.explicitRequired != 1"
     ref="quickInputSelect"
     :class="{ 'quick-input-select-mul': handleMaxTagCount > 0 }"
     :notFoundContent="fetchingWordbook ? undefined : '暂无数据'"
   >
-    <a-spin v-if="fetchingWordbook" slot="notFoundContent" size="small" />
+    <!-- <a-spin v-if="fetchingWordbook" slot="notFoundContent" size="small" /> -->
+    <span v-if="fetchingWordbook" slot="notFoundContent" size="small" />
     <template v-if="item.comType == 'SelectMuiWordBook'">
       <a-select-option
         v-for="(sea, k) in item.dataSource"
@@ -47,8 +48,8 @@
       </a-select-option>
     </template>
 
-    <div slot="dropdownRender" class="drop-down-container" slot-scope="menu">
-      <a-spin :spinning="fetchingWordbook">
+    <div slot="dropdownRender" class="c-m-sdrop-down-container" slot-scope="menu">
+      <a-spin :spinning="fetchingWordbook" :tip="`加载中...`" >
         <v-nodes :vnodes="menu" />
         <select-pages v-if="!isnoPages" :searchPageConfig="item.searchPageConfig" :handleSearchChangePage="handleSearchChangePage" />
       </a-spin>
@@ -56,7 +57,7 @@
   </a-select>
 </template>
 <script>
-import { Select, Spin, Icon } from 'ant-design-vue';
+import { Select, Spin, Icon,Button } from 'ant-design-vue';
 import utils from '@/utils/utils-map';
 import selectPages from './select-pages';
 export default {
@@ -65,6 +66,7 @@ export default {
     [Select.name]: Select,
     [Select.Option.name]: Select.Option,
     [Spin.name]: Spin,
+    [Button.name]:Button,
     [Icon.name]: Icon,
     selectPages,
     VNodes: {
@@ -187,4 +189,10 @@ export default {
 .c-s-content-item {
   padding: 0 5px;
 }
+
+.c-m-sdrop-down-container {
+  .ant-select-dropdown-menu-item-disabled {
+    min-height: 42px;
+  }
+}
 </style>

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

@@ -15,9 +15,15 @@
       >
       </a-input>
     </slot>
-
+  <template v-if="item.com == 'SelectMui'">
+    <c-tree-select
+      v-if="item.comType === 'treeSelect'"
+      :item="item"
+      :handleGetConfigApi="handleGetConfigApi"
+      style="margin: 0 8px 8px 0"
+    />
     <multiSelect
-      v-if="item.com == 'SelectMui'"
+      v-else
       :item="item"
       :maxTagPlaceholder="maxTagPlaceholder"
       :outFilterChange="outFilterChange"
@@ -26,7 +32,10 @@
       :fetchingWordbook="fetchingWordbook"
       style="margin: 0 8px 8px 0"
     ></multiSelect>
+  </template>
+
     <a-range-picker
+      :allowClear="item.explicitRequired != 1"
       :format="item.showFormat"
       @change="value => rangePickerChange(value, item)"
       @ok="outFilterChange"
@@ -90,9 +99,11 @@
 <script>
 
 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: "一星",
@@ -123,13 +134,15 @@ const EVALUATEList = [
 export default {
   name: "OutQuickSearch",
   mixins: [filterApiFn],
-  components: { multiSelect },
+  components: { multiSelect,cTreeSelect,    [DatePicker.RangePicker.name]: DatePicker.RangePicker },
   props: {
     item: Object
   },
   data() {
     return {
-      fetchingWordbook: false
+      fetchingWordbook: false,
+      initSearch: false,
+      curDefaultValue: null,
     };
   },
 
@@ -138,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")]
         };
       };
     }
@@ -181,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);
         });
@@ -192,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,24 +383,38 @@ 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;
           });
           this.$set(el, "labelList", labelList);
         } else if (!this.$utils.isEmpty(el.setting.wordbook)) {
+          // TODO:
           // 存在映射 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, "com", "SelectMui");
-          this.$set(el, "comType", "SelectMuiWordBook");
-          this.$set(el, "value", []);
+          this.$set(el, "comType", comType);
+          this.$set(el, "value", defVal);
           this.$set(el, "dataSource", []);
           this.$set(el, "searchPageConfig", {
             keyword: undefined,
@@ -427,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);
@@ -500,24 +525,35 @@ export const outQuickSearchFn = {
           temp.value = item.value;
           conObj.push(temp);
         }
-        if (item.com === "SelectMui" && item.value.length) {
-          if (item.comType == "SelectMuiWordBook") {
+        if (item.com === "SelectMui" && item.value) {
+          let hasArr = Array.isArray(item.value) && item.value.length > 0
+          if (item.comType == "SelectMuiWordBook" && hasArr) {
             temp.value = item.value.join("|#|");
+          } else if(item.comType == "treeSelect"){
+            // 樹狀
+            let value = item.value;
+            if(typeof value === 'string'){
+              [value]  = value.split('<&=&>')
+            }
+            temp.value = value;
           } else {
-            if (item.con == "CONVERT") {
-              // 存在映射
-              let value = [];
-              value = item.value.map(i => {
-                return item.labelList[i].filter;
-              });
-              temp.value = value;
-            } else {
-              let value = [];
-              value = item.value.map(i => {
-                return item.labelList[i].labelName;
-              });
-              temp.value = value.join("|#|");
+            if(hasArr){
+              if (item.con == "CONVERT") {
+                // 存在映射
+                let value = [];
+                value = item.value.map(i => {
+                  return item.labelList[i].filter;
+                });
+                temp.value = value;
+              } else {
+                let value = [];
+                value = item.value.map(i => {
+                  return item.labelList[i].labelName;
+                });
+                temp.value = value.join("|#|");
+              }
             }
+
           }
           conObj.push(temp);
         }