fix(values-format): 修复defaultLabel无效的bug

fast-crud · Mar 1, 2023 · bb55591 · bb55591
1 parent d81d2b3
commit bb55591
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/packages/fast-crud/src/components/extends/fs-values-format.vue b/packages/fast-crud/src/components/extends/fs-values-format.vue
@@ -183,13 +183,12 @@ export default {
 
       if (dict) {
         options = dict.getNodesFromDataMap(valueArr);
-        if (props.defaultLabel) {
-          _.forEach(options, (item) => {
-            if (item[labelProp] == null) {
-              item[labelProp] = props.defaultLabel;
-            }
-          });
-        }
+        //设置默认label
+        _.forEach(options, (item) => {
+          if (item[labelProp] == null) {
+            item[labelProp] = props.defaultLabel || item[valueProp];
+          }
+        });
       } else {
         options = [];
         _.forEach(valueArr, (item) => {

diff --git a/packages/fast-crud/src/use/use-dict-define.ts b/packages/fast-crud/src/use/use-dict-define.ts
@@ -294,7 +294,7 @@ class Dict extends UnMergeable {
       if (node) {
         nodes.push(node);
       } else {
-        nodes.push({ [this.value]: item, [this.label]: item });
+        nodes.push({ [this.value]: item });
       }
     });
     return nodes;