cnhis-design-vue 2.1.147 → 2.1.148

package/package.json

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

package/packages/fabric-chart/src/fabric-chart/FabricTextGroup.vue

@@ -84,6 +84,12 @@ export default {
   mounted() {
     setTimeout(() => {
       document.addEventListener('keydown', this.handleInputBoxEnterEvent, true);
+
+      const _style = this.fabric.document.createElement('style');
+      _style.type = 'text/css';
+      const cssContent = this.fabric.document.createTextNode('.fabric-chart__hiddenTextarea { top:var(--fabric-chart-hiddenTextarea-height) !important }');
+      _style.appendChild(cssContent);
+      this.fabric.document.head.appendChild(_style);
     });
   },
   computed: {
@@ -167,6 +173,10 @@ export default {
               });
               this.canvas.add(this.inputObj).setActiveObject(this.inputObj);
               this.inputObj.enterEditing();
+              this.$nextTick().then(() => {
+                this.handleScroll();
+                this.inputObj.hiddenTextarea.classList.add('fabric-chart__hiddenTextarea');
+              });
               if (content) {
                 this.inputObj.setSelectionEnd(content.length);
               }
@@ -197,6 +207,11 @@ export default {
 
       Bus.$on('deleteOther', otherList => this.$emit('deleteOther', otherList));
     },
+    handleScroll(e) {
+      this.isRightVisible = false;
+      const wrapperElTop = this.canvas?.wrapperEl.getBoundingClientRect().top;
+      this.inputObj?.hiddenTextarea?.style?.setProperty('--fabric-chart-hiddenTextarea-height', `${wrapperElTop + this.inputObj.top + this.inputObj.height}px`);
+    },
     handleInputBoxEnterEvent(e) {
       if (!this.inputObj || ![13, 27].includes(e.keyCode)) return;
       if (e.keyCode === 27) {

package/packages/fabric-chart/src/mixins/eventCommon.js

@@ -33,7 +33,7 @@ export default {
   mounted() {
     if (this.eventStyle.evented) {
       document.addEventListener('click', this.handleClickAndScroll, true);
-      document.addEventListener('scroll', this.handleClickAndScroll, true);
+      document.addEventListener('scroll', this.handleScroll, true);
     }
   },
   methods: {
@@ -91,6 +91,9 @@ export default {
     },
     handleClickAndScroll(e) {
       this.isRightVisible = false;
+    },
+    handleScroll(e) {
+      this.handleClickAndScroll(e);
     }
   },
   beforeDestroy() {
@@ -98,7 +101,7 @@ export default {
       const upperCanvas = this.canvas.wrapperEl;
       upperCanvas && upperCanvas.removeEventListener('contextmenu', this.addEventListenerContextmenu, true);
       document.removeEventListener('click', this.handleClickAndScroll, true);
-      document.removeEventListener('scroll', this.handleClickAndScroll, true);
+      document.removeEventListener('scroll', this.handleScroll, true);
     }
   }
 };

package/packages/table-filter/src/classification/Classification-com.vue

@@ -420,6 +420,7 @@
       :tableId="tableId"
       :classifyModal="classifyModal"
       :filterApiConfig="filterApiConfig"
+      :isCrm="isCrm"
     >
       <template #searchCondition="{ attrs, listeners }">
         <slot name="searchCondition" :attrs="attrs" :listeners="listeners"></slot>
@@ -514,9 +515,13 @@ export default create({
     searchFieldList: {
       type: Array,
       default: () => []
-    }
+    },
+    libSource: {type: String, default: ''},
   },
   computed: {
+    isCrm() {
+      return this.libSource === 'crm';
+    },
     dynamicStyle() {
       if (this.classificationIndex === 0) {
         return {

package/packages/table-filter/src/components/search-condition/SearchCondition.vue

@@ -117,6 +117,23 @@
                 <a-input v-else v-model="item.value" :disabled="item.isIllegalField || item.is_compatibility" class="form-item" />
               </slot>
             </span>
+            <!-- 标签下拉 -->
+            <a-select
+              v-if="item.showLabelSelect"
+              class="val-label-wrap"
+              :filterOption="filterOption"
+              :disabled="item.isIllegalField"
+              v-model="item.value"
+              style="width: 160px"
+              showSearch
+              @dropdownVisibleChange="dropdownVisibleChangeLable($event, item)"
+              @select=" handleSelectLable($event, item)"
+              @deselect="handleDeSelectLable($event, item)"
+            >
+              <a-select-option v-for="v in item.labelList" :key="v.labelId" :value="v.labelId" >
+                {{ v.labelName}}
+              </a-select-option>
+            </a-select>
             <a-select
               class="val-select-wrap"
               v-if="item.showSearch"
@@ -328,7 +345,15 @@ export default create({
     openType: {
       type: String,
       default: ''
-    }
+    },
+    isCrm: {
+      type: Boolean,
+      default: false
+    },
+    filterApiConfig: {
+      type: Object,
+      default: () => {}
+    },
   },
   data() {
     return {
@@ -595,11 +620,12 @@ export default create({
         let end_val = '';
         let limit_date = [];
         let ageValue = {};
-        if (item?.settingObj?.attr === 'PERCENTAGE') {
+        let curAttr  = item?.settingObj?.attr;
+        if (curAttr === 'PERCENTAGE') {
           if (item.value) {
             item.value = Number(item.value) * 100;
           }
-        } else if (item && item.settingObj && item.settingObj.attr == 'BIRTHDAY') {
+        } else if (curAttr == 'BIRTHDAY') {
           start_val = item.start_val ? item.start_val : '';
           end_val = item.end_val ? item.end_val : '';
           if (item.limit_date) {
@@ -628,7 +654,7 @@ export default create({
               }
             }
           }
-        } else if (item && item.settingObj && item.settingObj.attr == 'AGE') {
+        } else if (curAttr == 'AGE') {
           this.$set(item, 'AGEAttr', true);
           start_val = item.start_val;
           end_val = item.end_val;
@@ -686,7 +712,12 @@ export default create({
           is_compare_field: item.is_compare_field || false,
           selectList: item.selectList || [],
           customInput: false, // 自定义输入
-          compare_field: item.compare_field // 选择的值
+          compare_field: item.compare_field, // 选择的值
+          labelList: [],
+          _labelListMap: {},
+          _labelName: item.value, // 标签入参存labelName, 但是可能会重复, 所以下拉的时候用labelId
+          isRequestLabel: false,
+          showLabelSelect: false
         };
       });
       this.actionList.forEach(item => {
@@ -791,9 +822,9 @@ export default create({
         let start_val = '';
         let end_val = '';
         let limit_date = [];
-        if (item.settingObj && item.settingObj.attr == 'PERCENTAGE') {
+        if (attrType == 'PERCENTAGE') {
           value = Number(value) / 100;
-        } else if (item.settingObj && item.settingObj.attr == 'BIRTHDAY') {
+        } else if (attrType == 'BIRTHDAY') {
           if (item.start_val) {
             let res = utils.validateBirthday(item.start_val, item.title, item.unit);
             if (!res) return;
@@ -815,6 +846,8 @@ export default create({
           start_val = item.start_val;
           end_val = item.end_val;
           value = item.value;
+        } else if (attrType === 'LABEL' && this.isCrm && item._labelName) {
+          value = item._labelName;
         } else {
           start_val = item.start_val ? item.start_val.format('YYYY-MM-DD HH:mm:ss') : '';
           end_val = item.end_val ? item.end_val.format('YYYY-MM-DD HH:mm:ss') : '';
@@ -929,10 +962,16 @@ export default create({
       action.fieldType = f?.fieldType || undefined;
       this.$set(action, 'wordValue', []);
       this.$set(action, 'wordbookData', []);
+      this.$set(action, 'labelList', []);
+      this.$set(action, 'isRequestLabel', false);
       this.formatData(value, action);
       this.handleHideItem(action);
       this.handleHideCompareField(action);
       this.$set(action, 'isIllegalField', value && !this.searchListKey.includes(value));
+      let isCrmLabel = this.isCrm && action?.settingObj?.attr === "LABEL"
+      if(isCrmLabel) {
+        this.getLableData(action)
+      }
     },
     // 数据处理
     formatData(value, action) {
@@ -943,6 +982,7 @@ export default create({
           action.settingObj = sea.settingObj;
           let attrType = sea?.settingObj?.attr || '';
           let format = sea?.settingObj?.format || '';
+          let isCrmLabel = this.isCrm && attrType === "LABEL"
           action.title = sea.title || '';
           if (sea.setting) {
             utils.isPlainObject(sea.setting) ? '' : (sea.setting = JSON.parse(sea.setting));
@@ -1070,6 +1110,40 @@ export default create({
         return res;
       });
     },
+    getLableData(item){
+      // 请求过label就不再请求了
+      let type = item.settingObj?.labelType
+      if(!type || item.isRequestLabel) return;
+      let requestedLabel = this.filterApiConfig?.requestedLabel
+      if (!requestedLabel || typeof requestedLabel !== 'function') return;
+      this.handleGetConfigApi(type, 'requestedLabel').then(list => {
+        let _labelListMap = {}
+        list.map(v => {
+          _labelListMap[v.labelId] = v;
+        })
+        let mItem = list.find(v => v.labelName === item.value)
+        mItem && (item.value = mItem.labelId);
+        this.$set(item, 'labelList', list || []);
+        this.$set(item, '_labelListMap', _labelListMap);
+        this.$set(item, 'isRequestLabel', true);
+      })
+    },
+    dropdownVisibleChangeLable(open, item){
+      if(!open) return;
+      this.getLableData(item)
+    },
+    handleSelectLable(val, item){
+      let option = item._labelListMap?.[val] || {}
+      let name = option?.labelName;
+      this.$set(item, 'value', val);
+      this.$set(item, '_labelName', name);
+    },
+    handleDeSelectLable(val, item){
+      this.$set(item, 'value', '');
+      this.$set(item, '_labelName', '');
+    },
+    
+    
     handleWordbookData(item, data) {
       let { settingObj = {} } = item;
       let { showKeys = [], defaultValue, defaultValueTitle } = settingObj.wordbook || {};
@@ -1199,13 +1273,24 @@ export default create({
       item.showRangeAge = false; // 年龄范围
       item.showAgeCom = false; // 年龄范围
       let inRelation = ['QUOTE_IN', 'QUOTE_NOTIN'];
+      // 标签 等于和不等于，自定义输入后面文本框，修改为下拉框进行选择
+      let isCrmLabel = this.isCrm && attr === 'LABEL' &&['EQ', 'NEQ'].includes(value);
       if (arr.includes(value)) {
         item.showInput = false;
         item.showSelect = false;
         item.showDate = false;
         item.showSearch = false;
         item.showRelation = false;
+        item.showLabelSelect = false;
         this.initBirthdayParams(item);
+      } else if(isCrmLabel) {
+        item.showSelect = false;
+        item.showDate = false;
+        item.showInput = false;
+        item.showSearch = false;
+        item.showRelation = false;
+        item.showLabelSelect = true;
+        item._labelName = "";
       } else if (['IN_THE_PAST', 'IN_THE_FUTURE', 'N_', 'L_', 'IN_THE_PAST_DI', 'IN_THE_FUTURE_DI'].includes(value)) {
         // 以前、以后、过去内、未来内
         // L_ N_ IN_THE_PAST IN_THE_FUTURE 添加小时
@@ -1216,6 +1301,7 @@ export default create({
         item.showDate = false;
         item.showSearch = false;
         item.showRelation = false;
+        item.showLabelSelect = false;
         if (value == 'IN_THE_PAST_DI' || value == 'IN_THE_FUTURE_DI') {
           this.$set(item, 'dateList', this.dateList);
         } else {
@@ -1242,12 +1328,14 @@ export default create({
         item.showInput = false;
         item.showSearch = false;
         item.showRelation = false;
+        item.showLabelSelect = false;
       } else if (value == 'CONVERT' || value == 'QUOTE' || value == 'QUOTE_NOT') {
         item.showDate = false;
         item.showSelect = false;
         item.showInput = false;
         item.showSearch = true;
         item.showRelation = false;
+        item.showLabelSelect = false;
         this.initBirthdayParams(item);
         let showSetting = false;
         if (item.settingObj?.showSetting?.length) {
@@ -1264,8 +1352,10 @@ export default create({
         item.showSelect = false;
         item.showDate = false;
         item.showSearch = false;
+        item.showLabelSelect = false;
         this.initBirthdayParams(item);
       } else if (attr == 'AGE') {
+        item.showLabelSelect = false;
         if (ageList.includes(value)) {
           item.showAgeCom = true;
         }
@@ -1279,6 +1369,7 @@ export default create({
         }
         item.showSearch = false;
         item.showRelation = false;
+        item.showLabelSelect = false;
         this.initBirthdayParams(item);
       }
 
@@ -1340,6 +1431,9 @@ export default create({
       item.showDate = false;
       item.showSearch = false;
       item.showRelation = false;
+      item.showLabelSelect = false;
+      item._labelName = '';
+      item._labelListMap = {};
 
       // item.value = "";
       // this.$set(item, 'value', '');