cnhis-design-vue 2.1.79 → 2.1.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.79",
+  "version": "2.1.80",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",

package/packages/big-table/src/BigTable.vue

@@ -733,7 +733,7 @@ export default create({
       return str;
     },
     // 日期显示格式化
-    getDate(row, item) {
+    getDate(row, item, attrType) {
       let obj = row[item.columnName] || '';
       let style = {};
       // fillColor 有值代表背景色
@@ -754,6 +754,13 @@ export default create({
           ];
         }
       }
+      if (attrType === 'BIRTHDAY') {
+        return [
+          <a-tooltip title={obj}>
+            <span domPropsInnerHTML={obj} style={style} />
+          </a-tooltip>
+        ];
+      }
       return [<span domPropsInnerHTML={obj} style={style}></span>];
     },
     // 百分数格式化
@@ -1415,6 +1422,10 @@ export default create({
       this.columnLen = currentColumns.filter(item => item.visible).length;
       return columns;
     },
+    _isAge(item){
+      if(item.attrType !== 'BIRTHDAY') return false;
+      return item.settingObj?.format?.includes?.("age")
+    },
     // 2022/12/1 沈培均/方晶晶要求新增 如果有自定义提示就不显示表格自带的提示
     handleShowOverflow(item) {
       // 2023/03/17 新增单行高度由内容撑开, 不需要缺省
@@ -1422,6 +1433,7 @@ export default create({
       if (item.columnName == "operatorColumn") return false;
       // 选人组件 自己的tooltip
       if (item.attrType === "CANDIDATE_COMPONENTS") return false;
+      if(this._isAge(item)) return false;
       let {showSetting} = item.settingObj || {}
       if (!showSetting || !showSetting.length) return 'title';
       let hasTips = 'title';
@@ -2071,8 +2083,8 @@ export default create({
       if (attrType == 'MAP') {
         return this.getMapVal(row, own);
       }
-      if (attrType == 'DATE' || attrType == 'TASKDATE') {
-        return this.getDate(row, own);
+      if (attrType == 'DATE' || attrType == 'TASKDATE'|| this._isAge(own)) {
+        return this.getDate(row, own, attrType);
       }
       if (attrType == 'PERCENTAGE') {
         return this.getPercentage(row, own);

package/packages/big-table/src/assets/style/table-base.less

@@ -273,20 +273,23 @@ body {
       border-right-color: #5585f5;
     }
   }
+  /deep/ .vxe-body--column.col--checkbox {
+    .vxe-cell {
+      position: relative;
+    }
+  }
   /deep/ .disabled-checked-tips {
     position: absolute;
-    left: 6px;
+    left: 50%;
     top: 50%;
-    bottom: 0;
-    right: 0;
     box-sizing: border-box;
     width: 16px;
     height: 16px;
-    margin-top: -8px;
     overflow: hidden;
     border-radius: 50%;
     border: 2px solid #b5b5b5;
     background: #fff;
+    transform: translate(-50%, -50%);
     &:hover {
       border-color: #ff1818;
       &::after {

package/packages/select-label/select-label.vue

@@ -9,9 +9,9 @@
         新增
       </span>
     </div>
-    <div class="common-label" v-if="sourceType == 'form' && commonLabelList.length && item_is_edit && !explicit">
+    <div class="common-label" v-if="sourceType == 'form' && commonLabelList.length && !explicit">
       <span>常用</span>
-      <a-checkable-tag v-for="(item, i) in commonLabelList" v-model="item.isSelect" @change="handleCommonLabelChange($event, item)" :key="i" :style="handleLabelColor(item)">
+      <a-checkable-tag v-for="(item, i) in commonLabelList" v-model="item.isSelect" @change="handleCommonLabelChange($event, item)" :key="i" :style="handleLabelColor(item)" :class="{'label-common-check-disabel': !item_is_edit}">
         {{ item.labelName }}
       </a-checkable-tag>
     </div>
@@ -233,6 +233,7 @@ export default create({
       this.hanldeSetLabelItem(d.labelId, false);
     },
     handleCommonLabelChange(v, d) {
+      if(!this.item_is_edit) return;
        let multipleChoiceConfig = this.multipleChoiceConfig;
       let selectedList = this.labelSelectedList || [];
       if (v) {
@@ -304,6 +305,7 @@ export default create({
     },
 
     handleLabelColor(...arg) {
+      if(!this.item_is_edit) return {}
       return utils.handleLabelColor(...arg);
     },
 
@@ -500,10 +502,24 @@ export default create({
   .ant-tag-checkable {
     cursor: pointer;
     box-sizing: border-box;
+    &.label-common-check-disabel {
+      color: rgba(33, 33, 33, 0.6);
+      background: rgb(250, 250, 250);
+      border-color: rgba(213, 213, 213, 0.8);
+      cursor: default;
+      &:hover,
+      &:active,
+      &:focus {
+        color: rgba(33, 33, 33, 0.6);
+        background: rgb(250, 250, 250);
+        border-color: rgba(213, 213, 213, 0.8);
+      }
+    }
   }
   /deep/ .ant-tag {
     margin-bottom: 4px;
   }
+  
 }
 .form-add-icon-label {
   margin-bottom: 4px;

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

@@ -54,7 +54,7 @@
           <!-- start--筛选外显--start -->
           <template v-for="item in outSearchFieldList">
             <li class="outQuickSearch-li" v-if="item.isRender" :key="item._frontId">
-              <RenderWidget style="margin: 0 8px 8px 0" :cfg="item" v-model="item.value" @outFilterChange="outFilterChange" />
+              <RenderWidget style="margin: 0 8px 8px 0" :cfg="item" v-model="item.value" source="baseSearch" :filterApiConfig="filterApiConfigOutSearch" @outFilterChange="outFilterChange" />
             </li>
             <outQuickSearch v-else :key="item.id + item.random_key" :item="item" :ref="item.columnName + item.random_key" :filterApiConfig="filterApiConfigOutSearch" @outFilterChange="outFilterChange"></outQuickSearch>
           </template>
@@ -412,8 +412,10 @@ import PrintBtn from '~/button/src/ButtonPrint/index';
 
 import outQuickSearch from '../components/out-quick-search/out-quick-search';
 import utils from '@/utils/utils-map';
-import { durationMixin, $utils, filterApiFn, outQuickSearchFn } from '../mixins/mixins';
+import { durationMixin, $utils, filterApiFn, outQuickSearchFn, outQuickSearchDefCommon } from '../mixins/mixins';
 import tableSearchCon from '../mixins/tableSearchCon';
+import OutQuickMethod from '../mixins/out-quick-method'
+import dynamicMethod from '../components/render-widget/mixins/dynamic-method'
 import svgIcon from '@/component/svg/index.vue';
 import 'text-security/text-security.css';
 import create from '@/core/create';
@@ -466,7 +468,7 @@ const BTNOBJ = {
 
 export default create({
   name: 'base-search',
-  mixins: [durationMixin, $utils, filterApiFn, tableSearchCon, outQuickSearchFn],
+  mixins: [durationMixin, $utils, filterApiFn, tableSearchCon, outQuickSearchFn, outQuickSearchDefCommon, OutQuickMethod, dynamicMethod],
   directives: { resize, preventReClick },
   props: {
     width: {
@@ -1801,18 +1803,8 @@ export default create({
       }
 
       // 如有配置默认值
-      const isSetDefVal = this.outSearchFieldList.some(v => {
-        if (this.isRender(v)) {
-          return this.isExistDefValByRenderWidget(v);
-        }
-        return !!v.explicitDefaultVal
-      });
-      if (isSetDefVal) {
-        this.$emit('outSearchInit');
-        if ('reset' != config?.type) {
-          this.outFilterChange({ type: 'outSearchInit' });
-        }
-      }
+      this.isOut = true;
+      this.handleDefVal(config)
     },
     dealOutFilterHideBtn() {
       if (!this.isShowSetting('buttonAdaption') && this.outSearchFieldList.length > 0) {

package/packages/table-filter/src/components/TextOverTooltip.vue

@@ -1,7 +1,17 @@
 <template>
   <div class="text-over-tooltip-components">
-    <a-tooltip :effect="effect" :disabled="isDisabledTooltip" :title="curContent" :placement="placement">
-      <div class="ellipsis" :class="className" @mouseover="onMouseOver(refName)">
+    <a-tooltip
+      :effect="effect"
+      :visible="isDisabledTooltip"
+      :title="curContent"
+      :placement="placement"
+    >
+      <div
+        class="ellipsis"
+        :class="className"
+        @mouseover="onMouseOver(refName)"
+        @mouseout="onMouseOut"
+      >
         <i :ref="refName">
           <slot></slot>
           <i>{{ content }}</i>
@@ -12,10 +22,10 @@
 </template>
 
 <script>
-import { Tooltip } from 'ant-design-vue';
+import { Tooltip } from "ant-design-vue";
 import vexutils from '@/utils/vexutils';
 export default {
-  name: 'TextOverTooltip',
+  name: "TextOverTooltip",
   components: {
     [Tooltip.name]: Tooltip
   },
@@ -30,27 +40,27 @@ export default {
     effect: {
       type: String,
       default: () => {
-        return 'dark';
+        return "dark";
       }
     },
     // Tooltip 的出现位置top/top-start/top-end/bottom/bottom-start/bottom-end/left/left-start/left-end/right/right-start/right-end
     placement: {
       type: String,
       default: () => {
-        return 'top';
+        return "top";
       }
     },
-    tooltipTitle: { type: [Number, String], default: '' },
+    tooltipTitle: { type: [Number, String], default: "" },
     isAlias: Boolean
   },
   data() {
     return {
-      isDisabledTooltip: true // 是否需要禁止提示
+      isDisabledTooltip: false // 是否需要禁止提示
     };
   },
   computed: {
     curContent() {
-      let res = this.tooltipTitle || this.content || '';
+      let res = this.tooltipTitle || this.content || "";
       if (vexutils.isNumber(res)) {
         return res.toString();
       }
@@ -61,13 +71,16 @@ export default {
     // 移入事件: 判断内容的宽度contentWidth是否大于父级的宽度
     onMouseOver(str) {
       if (this.isAlias) {
-        this.isDisabledTooltip = false;
+        this.isDisabledTooltip = true;
         return;
       }
       let parentWidth = this.$refs[str].parentNode.offsetWidth;
       let contentWidth = this.$refs[str].offsetWidth;
       // 判断是否禁用tooltip功能
-      this.isDisabledTooltip = contentWidth <= parentWidth;
+      this.isDisabledTooltip = contentWidth > parentWidth;
+    },
+    onMouseOut() {
+      this.isDisabledTooltip = false;
     }
   }
 };

package/packages/table-filter/src/components/age-com/index.vue

@@ -1,15 +1,15 @@
 <template>
   <div class="container age-com" :class="{ 'form-item-disabled': isDetail }">
     <template v-if="showType.includes('YYYY')">
-      <a-input-number :value="ageValue.year" @change="handleYearChange" :disabled="isDisabled || isDetail" :min="0" />
+      <a-input-number :value="ageValue.year" @change="handleYearChange" :disabled="isDisabled || isDetail" :min="0" placeholder="请输入岁" />
       <span class="age-com-suffix">岁</span>
     </template>
     <template v-if="showType.includes('MM')">
-      <a-input-number :value="ageValue.month" @change="handleMonthChange" :disabled="isDisabled || isDetail" :min="0" />
+      <a-input-number :value="ageValue.month" @change="handleMonthChange" :disabled="isDisabled || isDetail" :min="0" placeholder="请输入月" />
       <span class="age-com-suffix">月</span>
     </template>
     <template v-if="showType.includes('DD')">
-      <a-input-number v-if="showType.includes('DD')" :value="ageValue.day" @change="handleDayChange" :disabled="isDisabled || isDetail" :min="0" />
+      <a-input-number v-if="showType.includes('DD')" :value="ageValue.day" @change="handleDayChange" :disabled="isDisabled || isDetail" :min="0" placeholder="请输入日" />
       <span class="age-com-suffix">日</span>
     </template>
   </div>

package/packages/table-filter/src/components/checkbox-group/CheckboxGroup.vue

@@ -0,0 +1,53 @@
+<template>
+  <CheckboxGroup v-bind="$attrs" :value="valueCp" @change="onChange"></CheckboxGroup>
+</template>
+
+<script>
+import { Checkbox } from 'ant-design-vue';
+
+export default {
+  inheritAttrs: false,
+  components: {
+    CheckboxGroup: Checkbox.Group,
+  },
+  props: {
+    value: {
+      type: [Array, String, Number],
+    },
+    multiple: {
+      type: Boolean,
+      default: false,
+    }
+  },
+  model: {
+    prop: "value",
+    event: "update:value"
+  },
+  computed: {
+    valueCp: {
+      set(val) {
+        this.$emit("update:value", val);
+      },
+      get() {
+        return Array.isArray(this.value) ? this.value : this.value ? [this.value] : [];
+      }
+    }
+  },
+  methods: {
+    filterNewVal(val) {
+      return val.filter((v) => !this.valueCp.includes(v));
+    },
+    onChange(val) {
+      if (!this.multiple && Array.isArray(val)) {
+        let res = this.filterNewVal(val)?.[0]
+        this.valueCp = res ? [res]: [];
+        return;
+      }
+      this.valueCp = val;
+    },
+  },
+}
+
+</script>
+<style lang='less'>
+</style>

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

@@ -3,7 +3,7 @@
     :mode="mode"
     v-if="item.com == 'SelectMui'"
     :placeholder="item.placeholder || `请选择${item.alias || item.title}`"
-    :style="{width: `${item.advanceColWidth||160}px`}"
+    :style="selectWidth"
     :dropdownMatchSelectWidth="false"
     :maxTagCount="handleMaxTagCount(item)"
     :maxTagPlaceholder="handleMaxTag(item)"
@@ -85,6 +85,12 @@ export default {
   },
 
   computed: {
+    selectWidth(){
+      if(this.source !== 'quickSearch' || this.item?.advanceColWidth) {
+        return {width: `${this.item?.advanceColWidth || 160}px`}
+      }
+      return {width: '100%'}
+    },
     handleMaxTagCount() {
       return function(item) {
         let len = this.maxTagPlaceholder(item);

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

@@ -42,7 +42,7 @@
       @change="value => rangePickerChange(value, item)"
       @ok="outFilterChange"
       v-model="item.value"
-      :placeholder="[`${item.alias || item.title}起始日期`, `${item.alias || item.title}截止日期`]"
+      :placeholder="[`起始${item.alias || item.title}`, `截止${item.alias || item.title}`]"
       v-if="item.com == 'DatePicker'"
       style="margin: 0 8px 8px 0"
       :showTime="handlePickerShowTime(item)"
@@ -116,7 +116,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 wordBookutils from '../../mixins/wordBookutils';
+import OutQuickMethod from '../../mixins/out-quick-method'
 import moment from 'moment';
 import { Input, DatePicker} from 'ant-design-vue';
 const EVALUATEList = [
@@ -148,7 +149,7 @@ const EVALUATEList = [
 ];
 export default {
   name: "OutQuickSearch",
-  mixins: [filterApiFn],
+  mixins: [filterApiFn, OutQuickMethod],
   components: {
     multiSelect,
     cTreeSelect,
@@ -180,126 +181,11 @@ export default {
   watch: {},
   // 生命周期
   created() {},
-  mounted() {
-    this.init();
-  },
+  mounted() {},
 
   // 方法
   methods: {
 
-    init(){
-      let item = this.item;
-      let df = item.explicitDefaultVal;
-      if(item.com == 'SelectMui' && df){
-        this.dropdownVisibleChange(true, item, {type:'hasDefaultInit'})
-      }
-    },
-
-    handleWordBookSearch(value, item, config = {}) {
-      if (item.comType != "SelectMuiWordBook") return;
-      let curAutograph = item.settingObj.wordbook && item.settingObj.wordbook.autograph;
-      let params = {
-        keyword: value,
-        autograph: curAutograph
-      };
-      let obj = {};
-      let p = item?.setting?.wordbook?.params || undefined;
-      if (p) {
-        item.setting.wordbook.params.forEach(item => {
-          obj[item.p_name] = item.p_value;
-        });
-      }
-      let rp = { ...params, ...obj, ...config }
-      this.getWordbookData(item.setting.wordbook, rp).then(({ data }) => {
-        this.handleWordbookData(item, data, rp);
-      });
-    },
-    dropdownVisibleChange(open, item, config={}) {
-      if (item.comType != "SelectMuiWordBook") return;
-      if (open) {
-        let obj = {};
-        if (item.setting.wordbook.params) {
-          item.setting.wordbook.params.forEach(item => {
-            obj[item.p_name] = item.p_value;
-          });
-        }
-        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);
-          if('hasDefaultInit' == config?.type){
-            this.outFilterChange({type:'outSearchInit'});
-          }
-        });
-      }
-    },
-    handleWordbookData(item, data, params) {
-      this.$set(item, "hasFieldList", false);
-      const {rows,hasFieldList,searchPageConfig} = wordBookutils.handleWordbookData(item,data,params);
-      this.$set(item, "hasFieldList", hasFieldList);
-      this.$set(item, "dataSource", rows);
-       let showKeys = item?.setting?.wordbook?.showKeys || [];
-      item.searchPageConfig = Object.assign(item.searchPageConfig, searchPageConfig);
-      // 初始化获取值
-      if(!this.initSearch){
-        let df = item.explicitDefaultVal;
-        if(df){
-          let defval = [];
-          if(df === 'firstOption'){
-           let [v,k] = rows;
-          //  如果有添加提示标题，取第二个
-           if(showKeys.length > 0 && item.hasFieldList){
-             v = k;
-           }
-           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;
-      this.fetchingWordbook = true;
-      let resFieldKeys = Array.isArray(filterKeys) ? JSON.stringify(filterKeys) : filterKeys;
-      let url = `/tableReader/getWordbookData`;
-      let params = {
-        wordbookId: id,
-        fieldKeys: resFieldKeys,
-        wordbookType: wordbookType || "WORDBOOK",
-        asyncCount: 1, // 开启性能模式
-        ...obj
-      };
-      return this.handleGetConfigApi(params, 'requestGetWordbookData', { fields: o }).then(res => {
-        this.fetchingWordbook = false;
-        if(typeof res.data === 'object'){
-          res.data.reqParams =  params;
-        }
-        return res;
-      }).catch(() => {
-        this.fetchingWordbook = false;
-      });
-      // return this.axios
-      //   .post(url, this.$qs.stringify(params))
-      //   .then(res => {
-      //     this.fetchingWordbook = false;
-      //     return res;
-      //   })
-      //   .catch(() => {
-      //     this.fetchingWordbook = false;
-      //   });
-    },
     rangePickerChange(value, item) {
       if (item.showTime) {
         if (!value.length && item.showTime) {

package/packages/table-filter/src/components/range-age/index.vue

@@ -1,26 +1,16 @@
 <template>
-  <a-input-group>
-    <a-row :gutter="8">
-      <a-col :span="11">
+  <a-input-group class="rang-age-input-group">
         <age-com
           :disabled="disabled"
           :format="format"
           @change="ageStartOnChange"
           :defaultValue="startValue"
-        ></age-com>
-      </a-col>
-      <a-col :span="1">
-        <div class="middle-tips">—</div>
-      </a-col>
-      <a-col :span="11">
-        <age-com
+        ></age-com><div class="middle-tips">—</div><age-com
           :disabled="disabled"
           :format="format"
           @change="ageEndOnChange"
           :defaultValue="endValue"
         ></age-com>
-      </a-col>
-    </a-row>
   </a-input-group>
 </template>
 
@@ -164,7 +154,16 @@ export default {
 </script>
 
 <style lang="less" scoped>
+.rang-age-input-group {
+  display: inline-flex;
+  width: 100%;
+  /deep/ .age-com {
+    max-width: calc(50% - 16px);
+    width: unset;
+  }
+}
 .middle-tips {
+  width: 32px;
   height: 30px;
   line-height: 30px;
   text-align: center;