feat(vue3core): 整理代码

lljj-x · Jul 26, 2022 · 54e9db4 · 54e9db4
1 parent 711c932
commit 54e9db4
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/packages/lib/utils/components/FieldGroupWrap.vue b/packages/lib/utils/components/FieldGroupWrap.vue
@@ -52,11 +52,9 @@ export default {
                 return title;
             }
 
-            const genFormProvide = this.genFormProvide;
-
-            const backTitle = ((genFormProvide.value && genFormProvide.value.fallbackLabel)
-                || genFormProvide.fallbackLabel?.value)
-                && this.curNodePath.split('.').pop();
+            const genFormProvide = this.genFormProvide?.value || this.genFormProvide;
+            const fallbackLabel = genFormProvide.fallbackLabel?.value || genFormProvide.fallbackLabel;
+            const backTitle = fallbackLabel && this.curNodePath.split('.').pop();
             if (backTitle !== `${Number(backTitle)}`) return backTitle;
 
             return '';

diff --git a/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.esm.js b/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.esm.js
@@ -9633,16 +9633,17 @@ var script = {
   },
   computed: {
     trueTitle: function trueTitle() {
-      var _genFormProvide$fallb;
+      var _this$genFormProvide, _genFormProvide$fallb;
 
       var title = this.title;
 
       if (title) {
         return title;
       }
 
-      var genFormProvide = this.genFormProvide;
-      var backTitle = (genFormProvide.value && genFormProvide.value.fallbackLabel || ((_genFormProvide$fallb = genFormProvide.fallbackLabel) === null || _genFormProvide$fallb === void 0 ? void 0 : _genFormProvide$fallb.value)) && this.curNodePath.split('.').pop();
+      var genFormProvide = ((_this$genFormProvide = this.genFormProvide) === null || _this$genFormProvide === void 0 ? void 0 : _this$genFormProvide.value) || this.genFormProvide;
+      var fallbackLabel = ((_genFormProvide$fallb = genFormProvide.fallbackLabel) === null || _genFormProvide$fallb === void 0 ? void 0 : _genFormProvide$fallb.value) || genFormProvide.fallbackLabel;
+      var backTitle = fallbackLabel && this.curNodePath.split('.').pop();
       if (backTitle !== "".concat(Number(backTitle))) return backTitle;
       return '';
     }

diff --git a/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.esm.min.js b/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.esm.min.js
diff --git a/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.umd.js b/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.umd.js
@@ -9637,16 +9637,17 @@
     },
     computed: {
       trueTitle: function trueTitle() {
-        var _genFormProvide$fallb;
+        var _this$genFormProvide, _genFormProvide$fallb;
 
         var title = this.title;
 
         if (title) {
           return title;
         }
 
-        var genFormProvide = this.genFormProvide;
-        var backTitle = (genFormProvide.value && genFormProvide.value.fallbackLabel || ((_genFormProvide$fallb = genFormProvide.fallbackLabel) === null || _genFormProvide$fallb === void 0 ? void 0 : _genFormProvide$fallb.value)) && this.curNodePath.split('.').pop();
+        var genFormProvide = ((_this$genFormProvide = this.genFormProvide) === null || _this$genFormProvide === void 0 ? void 0 : _this$genFormProvide.value) || this.genFormProvide;
+        var fallbackLabel = ((_genFormProvide$fallb = genFormProvide.fallbackLabel) === null || _genFormProvide$fallb === void 0 ? void 0 : _genFormProvide$fallb.value) || genFormProvide.fallbackLabel;
+        var backTitle = fallbackLabel && this.curNodePath.split('.').pop();
         if (backTitle !== "".concat(Number(backTitle))) return backTitle;
         return '';
       }

diff --git a/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.umd.min.js b/packages/lib/vue3/vue3-form-element/dist/vue3-form-element.umd.min.js