cnhis-design-vue 2.1.79 → 2.1.81

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.79",
+  "version": "2.1.81",
   "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/index.js

@@ -76,6 +76,7 @@ import { default as Age } from './age';
 import { default as SelectPerson } from './select-person';
 import { default as ScaleView } from './scale-view';
 import { default as SelectLabel } from './select-label';
+import { default as SelectTag } from './select-tag';
 import { default as VerificationCode } from './verification-code';
 import { default as DragLayout } from './drag-layout';
 import { default as MultiChat } from './multi-chat';
@@ -174,6 +175,7 @@ const components = [
   SelectPerson,
   ScaleView,
   SelectLabel,
+  SelectTag,
   VerificationCode,
   DragLayout,
   MultiChat,
@@ -290,6 +292,7 @@ export {
   locales,
   ScaleView,
   SelectLabel,
+  SelectTag,
   VerificationCode,
   DragLayout,
   MultiChat,

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/select-tag/index.js

@@ -0,0 +1,14 @@
+import SelectTag from './select-label';
+import TagFormContent from './labelFormContent';
+
+SelectTag.install = function(Vue){
+  Vue.component(SelectTag.name, SelectTag);
+  Vue.component(TagFormContent.name, TagFormContent);
+}
+
+
+Object.assign(SelectTag, {
+  TagFormContent,
+});
+
+export default SelectTag;

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

@@ -0,0 +1,133 @@
+<template>
+  <div class="edit-content">
+    <div v-if="!labelList || labelList.length === 0" class="label-disable-wrap">
+      <p class="label-disable-title">无可选标签</p>
+      <p class="label-disable-desc">请联系管理员进行标签管理设置</p>
+    </div>
+
+    <div v-else class="label-content">
+      <a-checkable-tag
+        v-for="item in labelList"
+        v-model="item.isSelect"
+        @change="onHandleLabelChange($event, item, categoryItem)"
+        :key="item.labelCode"
+        :style="formatStyle(item)"
+      >
+        <a-tooltip placement="topLeft" :mouseEnterDelay="0.5" :mouseLeaveDelay="0">
+          <template slot="title">
+            <span>{{ item.labelShowText }}</span>
+          </template>
+          {{ item.labelShowText }}
+        </a-tooltip>
+      </a-checkable-tag>
+    </div>
+  </div>
+</template>
+
+<script>
+import { Tooltip, Icon, Button, Input, Tag, Tabs, Anchor } from 'ant-design-vue';
+import create from '@/core/create';
+
+const baseActiveColor = 'rgb(85, 133, 245)';
+export default create({
+  name: 'label-classify',
+  data() {
+    return {};
+  },
+  props: {
+    categoryItem:{
+      type: Object,
+      default:()=>({})
+    },
+    selectedList:{
+      type: Array,
+      default:()=>[]
+    },
+    handleLabelChange: {
+      type: Function,
+      default: ()=>{}
+    }
+  },
+  computed: {
+    labelList(){
+      if (this.categoryItem?.labelList) {
+        return this.categoryItem.labelList.map(item => {
+          return {
+            ...item,
+            isSelect: this.showCheck(item)
+          }
+        })
+      }
+      return [];
+    }
+  },
+  methods: {
+    showCheck(label) {
+      const labelIndex = this.selectedList.findIndex(selectLabel => selectLabel.classifyId === this.categoryItem.classifyId && selectLabel.labelCode === label.labelCode);
+      return labelIndex > -1;
+    },
+    onHandleLabelChange(isSelect, item, categoryItem) {
+      this.handleLabelChange(isSelect, item, categoryItem);
+    },
+    formatStyle(item) {
+      return this.showCheck(item) ? {
+        background: item.backgroundColor || baseActiveColor,
+        borderColor: item.backgroundColor || baseActiveColor
+      } : {}
+    }
+  },
+  components: {
+    [Input.name]: Input,
+    [Icon.name]: Icon,
+    [Tabs.name]: Tabs,
+    [Tabs.TabPane.name]: Tabs.TabPane,
+    [Anchor.name]: Anchor,
+    [Anchor.Link.name]: Anchor.Link,
+    [Tooltip.name]: Tooltip,
+    [Button.name]: Button,
+    [Tag.name]: Tag,
+    [Tag.CheckableTag.name]: Tag.CheckableTag
+  },
+});
+</script>
+
+<style lang="less" scoped>
+.edit-content{
+  flex: 1;
+  padding: 8px 0 0 16px;
+  width: 100%;
+  .label-content{
+    display: flex;
+    flex-wrap: wrap;
+    line-height: 34px;
+    .ant-tag-checkable{
+      cursor: pointer;
+      position: relative;
+      height: 32px;
+      line-height: 32px;
+      text-align: center;
+      min-width: 108px;
+      max-width: 108px;
+      color: rgba(33, 33, 33, 0.6);
+      background: rgb(250, 250, 250);
+      border-color: rgba(213, 213, 213, 0.8);
+      font-size: 14px;
+      border-radius: 4px;
+      margin-bottom: 8px;
+      box-sizing: border-box;
+      span {
+        display: inline-block;
+        width: 80px;
+        height: 100%;
+        line-height: 30px;
+        overflow: hidden;
+        text-overflow: ellipsis;
+        white-space: nowrap;
+      }
+    }
+    .ant-tag-checkable-checked {
+      color: #fff !important;
+    }
+  }
+}
+</style>

package/packages/select-tag/labelFormContent.vue

@@ -0,0 +1,295 @@
+<template>
+  <div class="labelFormContent-page">
+    <template v-if="!tagRequestMap.status">
+      <div class="label-disable-wrap" >{{tagRequestMap.resultMsg}}</div>
+    </template>
+    <template v-else>
+      <div v-if="!categoryList.length" class="label-disable-wrap">
+        <p class="label-disable-title">无可选标签</p>
+        <p class="label-disable-desc">请联系管理员进行标签管理设置</p>
+      </div>
+      <div v-show="categoryList.length > 0" class="label-wrap" >
+        <!-- 表单内嵌打开标签组件的样式 -->
+        <div v-if="explicit" class="explicit-continer">
+          <a-tabs hideAdd :activeKey="labelAnchorKey" type="card" @change="labelAnchorTabsOnChange" tab-position="top">
+            <a-tab-pane v-for="(v) in categoryList" :key="`#${v.classifyId}-${v.classifyName}`">
+              <span slot="tab">
+                {{ v.classifyName }}
+                <!-- <span class="edit-label-type">({{ v.multipleChoice == 2 ? '单' : '多' }}选)</span> -->
+              </span>
+              <div class="explicit-label-wrap left-label-wrap">
+                <div class="edit-label-content">
+                  <labelClassify
+                    :categoryItem="v"
+                    :selectedList="curSelectedList"
+                    :handleLabelChange="handleLabelChange"
+                  />
+                </div>
+              </div>
+            </a-tab-pane>
+          </a-tabs>
+        </div>
+
+        <!-- 普通标签样式 -->
+        <div
+          v-else
+          class="left-label-wrap"
+          :class="{
+            'total-left-label-wrap': isChangeWindow
+          }"
+        >
+          <a-tabs hideAdd :activeKey="labelAnchorKey" @change="labelAnchorTabsOnChange" tab-position="left">
+            <a-tab-pane v-for="(v) in categoryList" :key="`#${v.classifyId}-${v.classifyName}`">
+              <span slot="tab">
+                {{ v.classifyName }}
+              </span>
+            </a-tab-pane>
+          </a-tabs>
+        </div>
+
+        <div
+          v-if="!explicit"
+          class="right-label-wrap"
+          :class="{
+            'total-right-label-wrap': isChangeWindow
+          }"
+        >
+          <a-anchor v-show="false" :getContainer="anchorGetContainer" @click="handleAnchorClick" @change="anchorOnChange">
+            <a-anchor-link
+              v-for="(v) in categoryList"
+              :key="v.classifyId"
+              :href="`#${v.classifyId}-${v.classifyName}`"
+              :title="v.classifyName"
+            />
+          </a-anchor>
+          <div v-for="(v, k) in categoryList" :key="k" class="edit-label-content">
+            <div class="edit-label" :id="`${v.classifyId}-${v.classifyName}`">
+              {{ v.classifyName }}
+              <!-- <span class="edit-label-type">({{ v.multipleChoice == 2 ? '单' : '多' }}选)</span> -->
+            </div>
+            <labelClassify
+              :categoryItem="v"
+              :selectedList="curSelectedList"
+              :handleLabelChange="handleLabelChange"
+            />
+          </div>
+        </div>
+      </div>
+    </template>
+  </div>
+</template>
+<script>
+
+import { Tooltip, Icon, Button, Input, Tag, Tabs, Anchor } from 'ant-design-vue';
+import create from '@/core/create';
+
+import labelClassify from './label-classify.vue';
+export default create({
+  name: 'tag-form-content',
+  components: {
+    [Input.name]: Input,
+    [Icon.name]: Icon,
+    [Tabs.name]: Tabs,
+    [Tabs.TabPane.name]: Tabs.TabPane,
+    [Anchor.name]: Anchor,
+    [Anchor.Link.name]: Anchor.Link,
+    [Tooltip.name]: Tooltip,
+    [Button.name]: Button,
+    [Tag.name]: Tag,
+    [Tag.CheckableTag.name]: Tag.CheckableTag,
+    labelClassify
+  },
+  props: {
+    // 选中的标签列表
+    selectedList: {
+      type: Array,
+      default: () => []
+    },
+    // 配置项
+    categoryList: {
+      type: Array,
+      default: () => []
+    },
+    // 弹窗样式
+    isChangeWindow: {
+      type: Boolean,
+      default: false
+    },
+    // 标签选择外显
+    explicit: {
+      type: Boolean,
+      default: false
+    },
+    // 接口请求状态
+    tagRequestMap: {
+      type: Object,
+      default: () => ({
+        status: true,
+        resultMsg: ''
+      })
+    }
+  },
+  inject: {},
+  data() {
+    return {
+      labelAnchorKey: this.categoryList?.length > 0 ? `#${this.categoryList[0].classifyId}-${this.categoryList[0].classifyName}` : '',
+      cacheAnchorKey: '',
+
+      curSelectedList: [] // 当前选中的label项
+    };
+  },
+
+  watch: {
+    selectedList: {
+      immediate: true,
+      deep: true,
+      handler(val) {
+        if (val) {
+          let list = Array.isArray(val) ? val : [];
+          this.curSelectedList = JSON.parse(JSON.stringify(list));
+        }
+      }
+    }
+  },
+  // 方法
+  methods: {
+    labelAnchorTabsOnChange(key) {
+      if (!key) return;
+      setTimeout(() => {
+        // let anchorKey = '#' + key;
+        let curLink;
+        curLink = this.$el.querySelector("a[href='" + key + "']");
+        curLink && curLink.click();
+        this.labelAnchorKey = key;
+      }, 32);
+    },
+    anchorOnChange(link) {
+      if (!link) return;
+      let curLink = link.slice(1);
+      this.cacheAnchorKey = curLink;
+    },
+    anchorGetContainer() {
+      return this.$el?.querySelector('.right-label-wrap');
+    },
+    handleAnchorClick(e) {
+      e.preventDefault();
+    },
+    handleLabelForm(cb) {
+      const selectList = [...(this.curSelectedList || [])];
+      cb(selectList);
+    },
+    handleLabelChange(isSelect, labelItem, categoryItem) {
+      let curSelecteds = this.curSelectedList || [];
+      if (isSelect) {
+        curSelecteds.push({
+          classifyId: categoryItem.classifyId,
+          classifyName: categoryItem.classifyName,
+          labelCode: labelItem.labelCode,
+          labelShowText: labelItem.labelShowText,
+          backgroundColor: labelItem.backgroundColor
+        })
+      } else {
+        const fdIndex = curSelecteds.findIndex(selectLabel => selectLabel.classifyId === categoryItem.classifyId && selectLabel.labelCode === labelItem.labelCode);
+        fdIndex > -1 && curSelecteds.splice(fdIndex, 1);
+      }
+      this.curSelectedList = curSelecteds;
+
+      // 外显实时改变通知
+      if (this.explicit) {
+        this.$emit('explicitOnChange', curSelecteds);
+      }
+    }
+  }
+});
+</script>
+<style lang="less" scoped>
+.labelFormContent-page {
+  width: 100%;
+  height: 100%;
+  .label-disable-wrap{
+    margin-top: 20px;
+    width: 100%;
+    font-size: 14px;
+    line-height: 20px;
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    color: #969696;
+    .label-disable-title {
+      color: #2e2e2e;
+      margin-bottom: 5px;
+    }
+  }
+
+  .label-wrap {
+    display: flex;
+    width: 100%;
+    height: 100%;
+    .left-label-wrap {
+      width: 160px;
+      height: 404px;
+      max-height: 404px;
+      &.total-left-label-wrap {
+        height: calc(100vh - 109px);
+        max-height: calc(100vh - 109px);
+      }
+      &.explicit-label-wrap {
+        width: 100%;
+        height: auto;
+        overflow: hidden;
+        overflow-y: auto;
+      }
+      /deep/.ant-tabs {
+        height: 100%;
+        .ant-tabs-nav-container {
+          padding: 0;
+        }
+        .ant-tabs-left-bar {
+          width: 100%;
+          .ant-tabs-tab {
+            text-align: left;
+          }
+        }
+        .ant-tabs-tab-prev,
+        .ant-tabs-tab-next {
+          display: none !important;
+        }
+        .ant-tabs-nav-wrap {
+          overflow-y: auto;
+          color: #212121;
+          .ant-tabs-tab {
+            padding: 12px 12px 12px 16px;
+            margin: 0px;
+          }
+        }
+        .ant-tabs-nav .ant-tabs-tab-active {
+          background-color: #f2f2f2;
+        }
+      }
+    }
+    .right-label-wrap {
+      flex: 1;
+      overflow-y: auto;
+      .edit-label-content{
+        display: flex;
+        flex-direction: column;
+        align-items: flex-start;
+        font-size: 14px;
+        .edit-label{
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          padding: 0 5px 0 16px;
+          word-wrap: normal;
+          color: #212121;
+          font-size: 16px;
+        }
+      }
+      &.total-right-label-wrap {
+        max-height: calc(100vh - 109px);
+      }
+    }
+  }
+}
+
+</style>