feat(vue3 core): 修复provide警告

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

Hide file tree

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

diff --git a/packages/lib/vue3/vue3-core/src/components/Widget.js b/packages/lib/vue3/vue3-core/src/components/Widget.js
@@ -216,7 +216,7 @@ export default {
             };
 
             // 运行配置回退到 属性名
-            const label = fallbackLabel(props.label, (props.widget && genFormProvide.value.fallbackLabel), props.curNodePath);
+            const label = fallbackLabel(props.label, (props.widget && genFormProvide.fallbackLabel.value), props.curNodePath);
             return h(
                 resolveComponent(COMPONENT_MAP.formItem),
                 {

diff --git a/packages/lib/vue3/vue3-core/src/index.js b/packages/lib/vue3/vue3-core/src/index.js
@@ -3,7 +3,7 @@
  */
 
 import {
-    getCurrentInstance, watch, ref, computed, h, provide
+    getCurrentInstance, watch, ref, computed, h, provide, toRefs
 } from 'vue';
 
 import { resolveComponent } from '@lljj/vjsf-utils/vue3Utils';
@@ -46,10 +46,10 @@ export default function createForm(globalOptions = {}) {
             }
 
             // 使用provide 传递跨组件数据
-            provide('genFormProvide', computed(() => ({
-                fallbackLabel: props.fallbackLabel
-            })));
-
+            const { fallbackLabel } = toRefs(props);
+            provide('genFormProvide', {
+                fallbackLabel,
+            });
             // rootFormData
             const rootFormData = ref(getDefaultFormState(props.schema, props.modelValue, props.schema, props.strictMode));
             const footerParams = computed(() => ({

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
@@ -1,5 +1,5 @@
 /** @license @lljj/vue3-form-element (c) 2020-2022 Liu.Jun License: Apache-2.0 */
-import { resolveComponent as resolveComponent$1, defineComponent, h, openBlock, createBlock, toDisplayString, createCommentVNode, createVNode, renderSlot, inject, computed, ref as ref$1, watch, toRaw, getCurrentInstance, provide, withCtx, Fragment, renderList, createTextVNode, onMounted } from 'vue';
+import { resolveComponent as resolveComponent$1, defineComponent, h, openBlock, createBlock, toDisplayString, createCommentVNode, createVNode, renderSlot, inject, computed, ref as ref$1, watch, toRaw, getCurrentInstance, toRefs, provide, withCtx, Fragment, renderList, createTextVNode, onMounted } from 'vue';
 
 function _typeof(obj) {
   "@babel/helpers - typeof";
@@ -9633,14 +9633,16 @@ var script = {
   },
   computed: {
     trueTitle: function trueTitle() {
+      var _genFormProvide$fallb;
+
       var title = this.title;
 
       if (title) {
         return title;
       }
 
-      var genFormProvide = this.genFormProvide.value || this.genFormProvide;
-      var backTitle = genFormProvide.fallbackLabel && this.curNodePath.split('.').pop();
+      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();
       if (backTitle !== "".concat(Number(backTitle))) return backTitle;
       return '';
     }
@@ -10078,7 +10080,7 @@ var Widget = {
       } : {}); // 运行配置回退到 属性名
 
 
-      var _label = fallbackLabel(props.label, props.widget && genFormProvide.value.fallbackLabel, props.curNodePath);
+      var _label = fallbackLabel(props.label, props.widget && genFormProvide.fallbackLabel.value, props.curNodePath);
 
       return h(resolveComponent(COMPONENT_MAP.formItem), _objectSpread2(_objectSpread2(_objectSpread2({
         class: _objectSpread2(_objectSpread2({}, props.fieldClass), {}, {
@@ -11415,11 +11417,12 @@ function createForm() {
       } // 使用provide 传递跨组件数据
 
 
-      provide('genFormProvide', computed(function () {
-        return {
-          fallbackLabel: props.fallbackLabel
-        };
-      })); // rootFormData
+      var _toRefs = toRefs(props),
+          fallbackLabel = _toRefs.fallbackLabel;
+
+      provide('genFormProvide', {
+        fallbackLabel: fallbackLabel
+      }); // rootFormData
 
       var rootFormData = ref$1(getDefaultFormState(props.schema, props.modelValue, props.schema, props.strictMode));
       var footerParams = computed(function () {