fix(lib): 添加严格模式配置，更精准计算anyOf 默认值

re #152

Author: lljj-x

packages/demo/demo-common/components/Naive/index.js

@@ -0,0 +1,11 @@
+/**
+ * Created by Liu.Jun on 2021/2/1 10:00 下午.
+ */
+
+import NaiveUI from 'naive-ui';
+
+export default {
+    install(app) {
+        app.use(NaiveUI);
+    }
+};

packages/demo/demo-v3/package.json

@@ -14,6 +14,7 @@
         "@lljj/vue3-form-element": "1.11.0",
         "ajv-i18n": "^3.5.0",
         "ant-design-vue": "^2.0.1",
+        "naive-ui": "^2.25.2",
         "demo-common": "1.2.0",
         "vue": "^3.0.0",
         "vuedraggable": "2.23.2"

packages/demo/demo-v3/src/pages/index/views/Demo/index.vue

@@ -252,6 +252,30 @@ const VueAntForm = defineAsyncComponent(async () => {
     };
 });
 
+const VueNaiveForm = defineAsyncComponent(async () => {
+    // eslint-disable-next-line no-unused-vars
+    const [naive, antForm] = await Promise.all([
+        import('demo-common/components/Naive/index.js'),
+        import('@lljj/vue3-form-naive/src/index')
+    ]);
+
+    return {
+        name: 'naiveFormWrap',
+        setup(props, { attrs, slots }) {
+            // hack 动态install antDv，因为我不知其它地方如何获取 vue app
+            if (!installedAntdv) {
+                const instance = getCurrentInstance();
+                instance.appContext.app.use(naive.default);
+                installedAntdv = true;
+            }
+
+            return () => h(antForm.default, {
+                ...attrs
+            }, slots);
+        }
+    };
+});
+
 const typeItems = Object.keys(schemaTypes);
 
 export default {
@@ -260,6 +284,7 @@ export default {
         CodeEditor,
         VueElementForm,
         VueAntForm,
+        VueNaiveForm,
         EditorHeader
     },
     data() {
@@ -273,6 +298,9 @@ export default {
             }, {
                 name: 'antdv',
                 component: 'VueAntForm'
+            }, {
+                name: 'Naive',
+                component: 'VueNaiveForm'
             }],
             customFormats: {
                 price(value) {
@@ -286,7 +314,7 @@ export default {
             return this.$route.query.type;
         },
         isUseLabelWidth() {
-            return this.curVueForm === 'VueElementForm';
+            return this.curVueForm !== 'VueAntForm';
         },
         trueFormProps() {
             if (!this.formProps) return {};

packages/lib/utils/vue3Utils.js

@@ -2,7 +2,7 @@
  * Created by Liu.Jun on 2020/4/25 14:45.
  */
 
-import { resolveComponent as _resolveComponent } from 'vue';
+import { defineComponent, h, resolveComponent as _resolveComponent } from 'vue';
 
 export {
     nodePath2ClassName, isRootNodePath, computedCurPath, getPathVal, path2prop
@@ -34,3 +34,26 @@ export function resolveComponent(component) {
 
     return component;
 }
+
+// 转换antdv、naive等非moduleValue的v-model组件
+export const modelValueComponent = (component, {
+    model = 'value'
+} = {}) => defineComponent({
+    inheritAttrs: false,
+    setup(props, { attrs, slots }) {
+        return () => {
+            const {
+                modelValue: value,
+                'onUpdate:modelValue': onUpdateValue,
+                ...otherAttrs
+            } = attrs;
+
+            // eg: 'a-input'
+            return h(resolveComponent(component), {
+                [model]: value,
+                [`onUpdate:${model}`]: onUpdateValue,
+                ...otherAttrs
+            }, slots);
+        };
+    }
+});

packages/lib/vue3/vue3-form-ant/src/config/utils.js

@@ -3,33 +3,9 @@
  */
 
 import { defineComponent, h } from 'vue';
-import { resolveComponent } from '@lljj/vjsf-utils/vue3Utils';
+import { resolveComponent, modelValueComponent } from '@lljj/vjsf-utils/vue3Utils';
 
-// 转换antdv 非moduleValue的v-model组件
-export const modelValueComponent = (component, {
-    model = 'value'
-} = {}) => defineComponent({
-    inheritAttrs: false,
-    setup(props, { attrs, slots }) {
-        return () => {
-            const {
-                modelValue: value,
-                'onUpdate:modelValue': onUpdateValue,
-                ...otherAttrs
-            } = attrs;
-
-            // eg: 'a-input'
-            return h(resolveComponent(component), {
-                [model]: value,
-                [`onUpdate:${model}`]: onUpdateValue,
-                ...otherAttrs
-            }, slots);
-        };
-    }
-});
-
-// 转换antdv 时间日期选择，moment format时间戳number类型报错兼容
-export const numberTimeComponent = component => defineComponent({
+const numberTimeComponent = component => defineComponent({
     inheritAttrs: false,
     setup(props, { attrs, slots }) {
 
@@ -61,3 +37,10 @@ export const numberTimeComponent = component => defineComponent({
         };
     }
 });
+
+export {
+    // 转换antdv 非moduleValue的v-model组件
+    modelValueComponent,
+
+    numberTimeComponent
+};

packages/lib/vue3/vue3-form-naive/.eslintignore

@@ -0,0 +1,3 @@
+/**/node_modules/*
+/**/dist/*
+/**/*.css

packages/lib/vue3/vue3-form-naive/.npmignore

@@ -0,0 +1 @@
+src/