cnhis-design-vue 2.1.77 → 2.1.79

package/package.json

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

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

@@ -1,5 +1,5 @@
 <template>
-  <TimeScaleValue v-if="templateData.top.xScalevalue.popupTop" :times="timeList" :templateData="templateData" />
+  <TimeScaleValue v-if="show" :times="timeList" :templateData="templateData" />
 </template>
 
 <script>
@@ -32,6 +32,10 @@ export default {
         originX: 'center',
         originY: 'center'
       };
+    },
+    show() {
+      const { showPopup } = this.templateData.top.xScalevalue || {};
+      return typeof showPopup === 'undefined' || showPopup;
     }
   },
   mounted() {},

package/packages/select-person/select-person.vue

@@ -92,7 +92,7 @@
           <div class="select-content">
             <slot v-if="defaultShowList && defaultShowList.length">
               <div class="tag-item def-item" v-for="(tag, i) in defaultShowList" :key="i">
-                {{ tag.title || tag[wordbookChild.user_name_obj] }}
+                <span class="tag-text" :title="tag.title || tag[wordbookChild.user_name_obj]">{{ tag.title || tag[wordbookChild.user_name_obj] }}</span>
                 <a-icon v-if="!isDetail" class="tag-close" type="close-circle" theme="filled" @click="closeDefaultTag(tag, i)" />
                 <!-- <svg-icon
                   v-if="!isDetail"
@@ -104,7 +104,7 @@
             </slot>
 
             <div class="tag-item" :class="{ isRoot: !tag.isLeaf }" v-for="tag in checkedTreeItem" :key="tag.key">
-              {{ tag.title || tag.key }} {{ treeCount(tag.count) }}
+              <span class="tag-text" :title="tag.title || tag.key">{{ tag.title || tag.key }} {{ treeCount(tag.count) }}</span>
               <!-- <svg-icon
                 v-if="!isDetail"
                 class="tag-close"
@@ -1381,7 +1381,7 @@ export default create({
         vexutils.searchTree(keyData.children, item => {
           childKeys.push(item.key);
         });
-        const allParentIds = getAllParentId(this.treeData[propStr], node.eventKey).filter(Boolean);
+        const allParentIds = getAllParentId(this.treeData[propStr], node.eventKey)?.filter(Boolean) || [];
         totalCheckedKeys = [...new Set(preChecked.concat(checkedKeys, childKeys))].filter(id => !allParentIds.includes(id));
       } else {
         // 如果是取消从之前的选择中把当前点击的及其子级去除选中作为temp值（兼容搜索的情况）
@@ -1396,7 +1396,7 @@ export default create({
         vexutils.searchTree(keyData.children, item => {
           needCancelKeys.push(item.key);
         });
-        const allParentIds = getAllParentId(this.treeData[propStr], node.eventKey).filter(Boolean);
+        const allParentIds = getAllParentId(this.treeData[propStr], node.eventKey)?.filter(Boolean) || [];
         totalCheckedKeys = [...new Set(preChecked.filter(key => !needCancelKeys.includes(key)))];
         if (!this.checkStrictly) {
           totalCheckedKeys = totalCheckedKeys.filter(id => !allParentIds.includes(id));
@@ -1511,6 +1511,7 @@ export default create({
 .people-tree {
   display: flex;
   .people-tree-item {
+    flex-shrink: 0;
     width: 300px;
     padding: 22px 12px 0;
     max-height: 376px;
@@ -1620,6 +1621,12 @@ export default create({
       flex: 1;
       overflow-y: auto;
       .tag-item {
+        .tag-text {
+          overflow: hidden;
+          white-space: nowrap;
+          text-overflow: ellipsis;
+          max-width: 300px;
+        }
         &.isRoot {
           background: rgba(@primary-color, 0.08);
           border: 1px solid rgba(@primary-color, 0.5);
@@ -1643,7 +1650,7 @@ export default create({
         margin-right: 8px;
         margin-bottom: 4px;
         padding: 0 6px;
-        white-space: nowrap;
+        // white-space: nowrap;
         background: rgba(#d5d5d5, 0.2);
         border: 1px solid rgba(#000000, 0.14);
         border-radius: 4px;

package/packages/shortcut-setter/src/ShortcutSetterItem.vue

@@ -3,6 +3,7 @@
     <label>
       {{ source.label ? `${source.label}:` : '' }}
       <a-input
+        v-bind="source.inputProps"
         ref="inputRef"
         :placeholder="parsedPlaceholder"
         :value="parsedContent"