cnhis-design-vue 2.1.57 → 2.1.58

package/package.json

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

package/packages/form-table/src/components/table-component/mixins/search.js

@@ -296,6 +296,10 @@ export default {
         cur.showLabel = "";
         cur.myUniqueKey = cur[myUniqueKey] || "";
         cur.myUniqueLabel = reqUniqueKey || "";
+        cur.copyRowObj = {
+          // 全部备份一下
+          ...cur
+        };
         if (wordbook.render_key && wordbook.render_key.length > 0) {
           wordbook.render_key.forEach(ren => {
             cur.showLabel += `≌${this.formatField(cur[ren])}`;

package/packages/scale-container/src/ScaleContainer.vue

@@ -157,6 +157,9 @@ export default create(defineComponent({
 
     onMounted(() => {
       setDefSize();
+      if (!isNil(minW.value) && defW < minW.value) {
+        State.width = minW.value;
+      }
       open.value && initEvents();
     });
 

package/src/component/select-options/index.vue

@@ -27,7 +27,7 @@
               @click="selectData(item, $event)"
             >
               <td v-for="column in columns" :key="column.dataIndex">
-                <c-ellipsis :content="item[column.key]" />
+                <c-ellipsis :content="showLabel(item, column.key)" />
               </td>
             </tr>
           </tbody>
@@ -158,6 +158,22 @@ export default defineComponent({
       }))
     );
 
+    const showLabel = (item, key) => {
+      const copyRowObj = item.copyRowObj || item;
+
+      let res = copyRowObj[key];
+      try {
+        if (res && typeof res == "string" && res.startsWith("###")) {
+          res = res.slice(3);
+          res = JSON.parse(res);
+          res = res.change_text;
+        }
+        return res || "";
+      } catch (error) {
+        return "";
+      }
+    };
+
     const findOptionVNode = val => {
       return options.value.find(i => getProps(i).value === val);
     };
@@ -333,7 +349,8 @@ export default defineComponent({
       isActive,
       isDisabled,
       selectData,
-      handlerKeyDown
+      handlerKeyDown,
+      showLabel
     };
   }
 });