cnhis-design-vue 2.1.127 → 2.1.129

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnhis-design-vue",
-  "version": "2.1.127",
+  "version": "2.1.129",
   "description": "前端业务UI库",
   "keyword": "cnhis-design-vue vue cnhis",
   "homepage": "http://dv.cnhis.com/",
@@ -114,4 +114,4 @@
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS"
     }
   }
-}
+}

package/packages/card-reader-sdk/src/cardReaderSDK.js

@@ -101,6 +101,18 @@ export default class CardReaderSDK {
     return this.readHealthCardDialog.show(options);
   }
 
+  async getCardType() {
+		await this.checkLoading();
+
+		const requestParams = this.createParams(TRANS_CMD.CARD_TYPE_READ, {
+			transsystem: '10',
+			transtype: 'IDCARD',
+			interfaceid: '0'
+		});
+
+		return this.checkResCodeAndLoading(this.insurance.getInsuranceInfoPromise(requestParams));
+	}
+
   async generalRequest(params = {}) {
     await this.checkLoading();
     const requestParams = this.createParams(TRANS_CMD.NS_GETPERSONALINFO, {}, params);

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

@@ -512,21 +512,33 @@ export default {
       const lineHeightSeq = (obj.seqStyle?.circle?.radius || 9) * 2 + 2;
       let prevLeft = originX;
       let prevCondition;
+      const pointerObj = {};
 
-      const setTop = (lineHeight, i, condition) => {
+      const setTop = (item, lineHeight, i, condition) => {
+        let _lineHeight = lineHeight;
+        if (item.desc && obj.showDesc) {
+          _lineHeight = lineHeight + lineHeightText;
+        }
         if (!~condition.limitIndex) {
-          condition.y += i === 0 ? lineHeight / 2 : lineHeight;
-          if (condition.y >= endY + markHeight - lineHeight / 2) {
+          condition.y += i === 0 ? _lineHeight / 2 : _lineHeight;
+          if (condition.y >= endY + markHeight - _lineHeight / 2) {
             condition.limitIndex++;
             if (condition.limitIndex === 0) {
               condition.y = baseYLimit;
-              condition.y -= lineHeight / 2;
+              condition.y -= _lineHeight / 2;
             }
           }
         } else {
-          condition.y -= lineHeight;
+          condition.y -= _lineHeight;
+        }
+        const y = condition.y;
+        let y1,
+          y2 = y;
+        if (item.desc && obj.showDesc) {
+          y1 = y + _lineHeight / 2 - lineHeight - lineHeightText / 2;
+          y2 = y + _lineHeight / 2 - lineHeight / 2;
         }
-        return condition.y;
+        return { y1, y2 };
       };
       this.markData.forEach((item, index) => {
         const condition = {
@@ -535,16 +547,15 @@ export default {
         };
         const x = this.computedX(item[0]);
         // 相隔小于或等于一个小格的宽度就继承上个时间标记的高度继续计算定位，即错位显示
-        if (x - prevLeft <= xCellWidth) {
+        const prevHasBelowShow = pointerObj[`x_${prevLeft}`]?.some(o => o > endY);
+        if (x - prevLeft <= xCellWidth && prevHasBelowShow) {
           Object.assign(condition, prevCondition);
         }
         if (this.isLimit(item[0])) {
           const pointList = [];
+          pointerObj[`x_${x}`] = [];
           item[1].forEach(async (v, i) => {
             const common = {
-              left: x,
-              originX: 'center',
-              originY: 'center',
               data: v.data || {},
               other: v.other || {},
               time: item[0],
@@ -553,23 +564,20 @@ export default {
               objectCaching: false
             };
 
+            let conditionRes;
             if (this.isObject(v) && !v.value) {
-              common.top = setTop(lineHeightImg, i, condition);
-              const option = {
-                ...obj.iconStyle,
-                ...v,
-                ...common
-              };
-              pointList.push(this.drawMarkPoint(v, option, obj));
+              conditionRes = setTop(v, lineHeightImg, i, condition);
+              pointList.push(this.drawMarkPoint(v, common, obj, conditionRes, x));
             } else if (v.value) {
               if (v.seq) {
-                common.top = setTop(lineHeightSeq, i, condition);
-                pointList.push(this.drawMarkPoint(v, common, obj));
+                conditionRes = setTop(v, lineHeightSeq, i, condition);
+                pointList.push(this.drawMarkPoint(v, common, obj, conditionRes, x));
               } else {
-                common.top = setTop(lineHeightText, i, condition);
-                pointList.push(this.drawMarkPoint(v, common, obj));
+                conditionRes = setTop(v, lineHeightText, i, condition);
+                pointList.push(this.drawMarkPoint(v, common, obj, conditionRes, x));
               }
             }
+            pointerObj[`x_${x}`].push(conditionRes.y2);
           });
           prevLeft = x;
           prevCondition = condition;
@@ -580,7 +588,13 @@ export default {
         }
       });
     },
-    async drawMarkPoint(v, option, obj) {
+    async drawMarkPoint(v, option, obj, { y1, y2 }, x) {
+      const positionObj = {
+        left: x,
+        originX: 'center',
+        originY: 'center',
+        top: y2
+      };
       let point;
       const eventStyle = !this.eventStyle.evented
         ? {
@@ -595,6 +609,9 @@ export default {
         }
         point = await this.createPoint(v?.url || v?.iconClassName ? 'img' : v.type, {
           ele: ele || '',
+          ...positionObj,
+          ...obj.iconStyle,
+          ...v,
           ...option,
           ...eventStyle
         });
@@ -602,6 +619,7 @@ export default {
         if (v.seq) {
           // 标记增加序号
           const circle = await this.createPoint('circle', {
+            ...positionObj,
             ...option,
             radius: 5,
             strokeWidth: 1,
@@ -611,10 +629,12 @@ export default {
           });
           const text = new this.fabric.Text(String(v.value), {
             ...defaultVaule.textStyle,
+            ...positionObj,
             ...option,
             ...(obj.seqStyle?.text || {})
           });
           point = await new this.fabric.Group([circle, text], {
+            ...positionObj,
             ...option,
             ...eventStyle
           });
@@ -622,11 +642,27 @@ export default {
           point = await new this.fabric.Text(String(v.value), {
             ...defaultVaule.textStyle,
             ...obj.style,
+            ...positionObj,
             ...option,
             ...eventStyle
           });
         }
       }
+      if (y1) {
+        const descPoint = new this.fabric.Text(String(v.desc), {
+          ...defaultVaule.textStyle,
+          ...positionObj,
+          ...option,
+          ...obj.style,
+          top: y1
+        });
+        point = await new this.fabric.Group([descPoint, point], {
+          ...option,
+          left: x,
+          originX: 'center',
+          ...eventStyle
+        });
+      }
 
       point.hasControls = point.hasBorders = false;
       this.pointEvent(point);

package/packages/scale-view/formitem/r-choice.vue

@@ -131,7 +131,7 @@
       show-search
       :mode="showMulti"
       :disabled="isLock"
-      @search="handleSearch"
+      @search="debounceSearch"
       @change="handleSelectChange"
       :getPopupContainer="getPopupContainer"
       :filterOption="filterOption"
@@ -171,11 +171,12 @@
  *  getSearchOptions 关键字检索的 function
  *  getCascadeOptions 获取级联数据的 furnction
  */
-import { Select, Input, Radio, Checkbox, Cascader, Icon } from 'ant-design-vue';
+import { Select, Input, Radio, Checkbox, Cascader, Icon, Spin } from 'ant-design-vue';
 import { judgeTypes } from '../mixin/judgeTypes';
 // import format from "@/components/table/mixins/format";
 // import TextOverTooltip from "./text-over-tooltip/TextOverTooltip.vue";
 import utils from '@/utils/utils-map';
+import vexutils from '@/utils/vexutils';
 import axios from 'axios';
 import 'viewerjs/dist/viewer.css';
 import { component as Viewer } from 'v-viewer';
@@ -211,6 +212,7 @@ export default {
     [Radio.name]: Radio,
     [Radio.Group.name]: Radio.Group,
     [Select.name]: Select,
+    [Spin.name]: Spin,
     [Select.Option.name]: Select.Option
   },
   computed: {
@@ -302,6 +304,9 @@ export default {
       optionsPreSuffixObj: {}
     };
   },
+  created(){
+    this.debounceSearch = vexutils.debounce(this.handleSearch, 100);
+  },
   methods: {
     init(value) {
       let options = value.options || [];
@@ -543,6 +548,7 @@ export default {
       try {
         // 动态数据源转静态数据
       if (this.cloneItem?.type == 'SELECT' && this.isDynamic2Static) return
+      this.fetching = true;
         this.curOptions = await this.getSearchOptions(
           {
             values: this.columnKey,
@@ -551,8 +557,10 @@ export default {
           },
           this.cloneItem
         );
+        this.fetching = false;
         console.log(this.curOptions, 'curOptions');
       } catch (error) {
+        this.fetching = false;
         console.log(error);
       }
     },

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

@@ -234,8 +234,11 @@
               <!-- 平铺按钮列表 -->
               <template v-for="(item, j) in rowTileBtnList">
                 <!-- v-if="item.type == 'ADD'" -->
-                <li ref="rowTileBtnItem" class="rowTileBtn-item 123" :key="item.sid" v-if="showLi(item)" :data-key="item.sid" data-source="rowTile">
-                  <template v-if="item.type == 'ADD' || item.type == 'BATCH'">
+                <li ref="rowTileBtnItem" class="rowTileBtn-item" :key="item.sid" v-if="showLi(item)" :data-key="item.sid" data-source="rowTile">
+                  <template v-if="isFrontendComponent(item) && !item.isHide">
+                    <slot name="frontendComponent" v-bind="$attrs" :curBtn="item"></slot>
+                  </template>
+                  <template v-else-if="item.type == 'ADD' || item.type == 'BATCH'">
                     <a-button
                       v-preventReClick="preventReTime"
                       v-show="visibleBtn(item) && !item.isHide"
@@ -314,7 +317,12 @@
                 <a-dropdown overlayClassName="baseSearch-fold-dropdown" v-show="!isInlineOperating">
                   <a-menu slot="overlay">
                     <template v-for="(b, j) in rowFoldBtnList">
-                      <a-menu-item v-show="visibleBtn(b)" :key="b.sid" class="dropdown-btn" v-if="showLiAdd(b)" @click="showDrawer(b, j)">
+                      <template v-if="isFrontendComponent(b)">
+                        <a-sub-menu v-if="visibleBtn(b)" title="读卡" :key="b.sid">
+                          <slot name="frontendComponent" v-bind="$attrs" comType="submenu" :curBtn="b"></slot>
+                        </a-sub-menu>
+                      </template>
+                      <a-menu-item v-show="visibleBtn(b)" :key="b.sid" class="dropdown-btn" v-else-if="showLiAdd(b)" @click="showDrawer(b, j)">
                         {{ b.alias || b.name }}
                         <getBtnIcon :data="b" :btnObj="btnObj" />
                       </a-menu-item>
@@ -340,7 +348,12 @@
                       <a-menu-item-group :key="key" v-if="showRowFoldBtnList(value.list)">
                         <template slot="title"></template>
                         <template v-for="(b, j) in value.list">
-                          <a-menu-item v-show="visibleBtn(b)" :key="b.sid" class="dropdown-btn" v-if="b.type == 'ADD'" @click="showDrawer(b, j)">
+                          <template v-if="isFrontendComponent(b)">
+                            <a-sub-menu v-if="visibleBtn(b)" title="读卡" :key="b.sid">
+                              <slot name="frontendComponent" v-bind="$attrs" comType="submenu" :curBtn="b"></slot>
+                            </a-sub-menu>
+                          </template>
+                          <a-menu-item v-show="visibleBtn(b)" :key="b.sid" class="dropdown-btn" v-else-if="b.type == 'ADD'" @click="showDrawer(b, j)">
                             {{ b.alias || b.name }}
                             <getBtnIcon :data="b" :btnObj="btnObj" />
                           </a-menu-item>
@@ -930,6 +943,13 @@ export default create({
       this.tabIndex = index;
       if (index !== -1) this.$emit('tabClick', this.tabConditionList[index]);
     },
+    isFrontendComponent(item){
+      if(item.type !== 'ADD') return false;
+      if(Array.isArray(item.settingObj)) {
+        return item.settingObj[0]?.trigger_type === 'FRONTEND_COMPONENT'
+      }
+      return item.settingObj?.trigger_type === 'FRONTEND_COMPONENT'
+    },
     pageResize(obj) {
       if (this.resizeFlag || this.visibleInlineOperateBtn || this.isRowEditing) return;
       let baseLeft = this.$refs['baseLeft'];

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

@@ -618,17 +618,20 @@
             class="edit-tag"
             v-for="(item, index) in parentNames"
             :key="index"
-            @dblclick="e => editParentName(e, item)"
+            @dblclick="e => editParentName(e, item, index)"
             @click="handleParentNameSelect(item, index)"
             :class="{ 'edit-tag-select': item.selected && item.disabled }"
           >
             <a-input
+              :ref="`${item.value}-${index}`"
               style="width: 100px"
               :value="item"
               :disabled="item.disabled"
               @blur="() => (item.disabled = true)"
               v-model="item.value"
+              :maxLength="10"
             />
+            <div v-if="item.disabled" class="disabled-mask" @click="maskClick"></div>
             <a-icon slot="suffix" type="close" @click="handleParentNamesRemove(index, item)" />
           </div>
           <template v-if="!parentNamesHasAdd">
@@ -1044,7 +1047,7 @@ export default create({
               this.$set(this.quickSearch[index], "value", i);
             }
           } else {
-             this.$set(this.quickSearch[index], "value", value);
+            this.$set(this.quickSearch[index], "value", value);
           }
         } else {
           this.clearQuickItem(item, index)
@@ -1635,10 +1638,13 @@ export default create({
       });
       this.addVal = "";
     },
-    editParentName(e, item) {
+    editParentName(e, item, index) {
       item.disabled = false;
+      let inputRef = `${item.value}-${index}`
+      let inputDom = this.$refs[inputRef]?.[0]
+      if(!inputDom) return;
       setTimeout(() => {
-        e.target.focus();
+        inputDom.focus();
       }, 0);
     },
     handleParentNameSelect(item, index) {
@@ -1650,6 +1656,7 @@ export default create({
       });
       item.selected = !item.selected;
     },
+    maskClick() {},
     handleParentNamesRemove(index, item) {
       this.handleParent(index, item);
     },
@@ -2214,6 +2221,21 @@ export default create({
     display: inline-block;
     margin-right: 10px;
     margin-bottom: 10px;
+    .disabled-mask {
+      position: absolute;
+      right: 0;
+      left: 0;
+      top: 0;
+      bottom: 0;
+      border-radius: 4px;
+    }
+    .anticon-close {
+      position: absolute;
+      right: 5px;
+      line-height: 36px;
+      color: #2d7aff;
+      font-size: 12px;
+    }
     .add-parent {
       border-color: #d9d9d9;
     }