cnhis-design-vue 3.1.11-beta.7 → 3.1.12-beta.0

package/es/packages/form-render/src/FormRender.vue_vue_type_script_setup_true_lang.js

@@ -1,13 +1,16 @@
-import { defineComponent, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString } from 'vue';
+import { defineComponent, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString } from 'vue';
 import { createForm, onFieldValueChange, isField } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
 import { cloneDeep } from 'lodash-es';
 import { NForm, NTabs, NTabPane } from 'naive-ui';
-import { useFormContext } from './hooks/useFormContext.js';
-import { useInitialData } from './hooks/useInitialData.js';
-import { useFieldList2Schema } from './hooks/useFieldList2Schema.js';
-import { useAnchor } from './hooks/useAnchor.js';
-import { useFieldVisitor } from './hooks/useFieldVisitor.js';
+import { useFieldListAdaptor } from './hooks/useFieldListAdaptor2.js';
+import '../../../../packages/form-render';
+import { useFieldVisitor } from './hooks/useFieldVisitor2.js';
+import '@vueuse/core';
+import '../../../../packages/form-render/src/utils';
+import { useInitialData } from './hooks/useInitialData2.js';
+import { useAnchor } from './hooks/useAnchor2.js';
+import { useFormContext } from './hooks/useFormContext2.js';
 
 const _hoisted_1 = {
   key: 0,
@@ -15,7 +18,6 @@ const _hoisted_1 = {
 };
 const _hoisted_2 = { style: { "white-space": "pre" } };
 var script = /* @__PURE__ */ defineComponent({
-  __name: "FormRender",
   props: {
     fieldList: { type: Array },
     initialData: { type: Object, default: () => ({}) },
@@ -30,19 +32,15 @@ var script = /* @__PURE__ */ defineComponent({
       default: () => ({})
     },
     scope: { type: Object, default: () => ({}) },
-    consumer: { type: Boolean, default: false }
+    consumer: { type: Boolean, default: false },
+    uuid: { type: String }
   },
   emits: [
     "formChange"
   ],
   setup(__props, { expose, emit }) {
     const props = __props;
-    const {
-      SchemaField,
-      businessCollector,
-      formItemDepsCollector,
-      changeContextCollector
-    } = useFormContext(props);
+    const { SchemaField, businessCollector, formItemDepsCollector, changeContextCollector, formUUID } = useFormContext(props);
     const formModel = createForm({
       initialValues: useInitialData().assignInitialData(props.initialData, props.fieldList),
       effects() {
@@ -60,37 +58,32 @@ var script = /* @__PURE__ */ defineComponent({
         });
       }
     });
-    const { traverse } = useFieldVisitor();
-    const { transform } = useFieldList2Schema(businessCollector);
+    const { schemaAdaptor } = useFieldListAdaptor(businessCollector, formUUID);
     const parsedSchema = computed(() => {
       if (props.schema) {
         return props.schema;
       }
       if (props.fieldList) {
-        const _fieldList = traverse(cloneDeep(props.fieldList), props.fieldVisitor);
-        return { type: "object", properties: transform(_fieldList) };
+        const _fieldList = useFieldVisitor().traverse(cloneDeep(props.fieldList), props.fieldVisitor);
+        const result = { type: "object", properties: schemaAdaptor(_fieldList) };
+        console.log(result);
+        return result;
       }
       return { type: "object", properties: {} };
     });
-    const {
-      currentAnchor,
-      scrollbarRef,
-      generateAnchorList,
-      anchorIdList,
-      formHeight,
-      scrollTo,
-      onScroll,
-      updateCurrentAnchor
-    } = useAnchor(props, formItemDepsCollector);
+    const { currentAnchor, scrollbarRef, generateAnchorList, anchorIdList, formHeight, scrollTo, onScroll } = useAnchor(props, formItemDepsCollector);
     watch(parsedSchema, generateAnchorList, { immediate: true });
-    function bindTitle(info) {
+    function bindInfo(info) {
+      var _a, _b;
       info.title = formModel.query(info.path).get("title");
+      info.decoratorElement = (_a = scrollbarRef.value) == null ? void 0 : _a.querySelector(`#${formUUID}-${info.path}`);
+      info.widgetElement = (_b = info.decoratorElement) == null ? void 0 : _b.querySelector(`input`);
       return info;
     }
     expose({
       validate(path = "*") {
         return formModel.validate(path).catch((err) => {
-          return Promise.reject(Array.isArray(err) ? err.map(bindTitle) : err);
+          return Promise.reject(Array.isArray(err) ? err.map(bindInfo) : err);
         });
       },
       getFormValues() {
@@ -119,7 +112,7 @@ var script = /* @__PURE__ */ defineComponent({
           __props.anchor ? (openBlock(), createElementBlock("section", _hoisted_1, [
             createVNode(unref(NTabs), {
               value: unref(currentAnchor),
-              "onUpdate:value": unref(updateCurrentAnchor),
+              "onUpdate:value": _cache[0] || (_cache[0] = ($event) => isRef(currentAnchor) ? currentAnchor.value = $event : null),
               type: "line"
             }, {
               default: withCtx(() => [
@@ -132,14 +125,14 @@ var script = /* @__PURE__ */ defineComponent({
                 }), 128))
               ]),
               _: 1
-            }, 8, ["value", "onUpdate:value"])
+            }, 8, ["value"])
           ])) : createCommentVNode("v-if", true),
           createElementVNode("section", {
             class: "form-render__wrapper",
             style: normalizeStyle({ "--column": __props.column, "--form-height": unref(formHeight) }),
             ref_key: "scrollbarRef",
             ref: scrollbarRef,
-            onScroll: _cache[0] || (_cache[0] = (...args) => unref(onScroll) && unref(onScroll)(...args))
+            onScroll: _cache[1] || (_cache[1] = (...args) => unref(onScroll) && unref(onScroll)(...args))
           }, [
             createVNode(unref(FormProvider), { form: unref(formModel) }, {
               default: withCtx(() => [

package/es/packages/form-render/src/FormRender2.js

@@ -0,0 +1,4 @@
+import script from './FormRender.vue_vue_type_script_setup_true_lang.js';
+export { default } from './FormRender.vue_vue_type_script_setup_true_lang.js';
+
+script.__file = "packages/form-render/src/FormRender.vue";

package/es/packages/form-render/src/components/renderer/cascader.js

@@ -1,159 +1 @@
-import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
-import { isObject, isString } from 'lodash-es';
-import { InjectAsyncQueue } from '../../constants/index.js';
-import { assignUpdateValue, formRenderLog, arrayed } from '../../utils/index.js';
-import { connect, mapProps } from '@formily/vue';
-import { NCascader } from 'naive-ui';
-import { useFormField } from '../../hooks/useFormField.js';
-
-const script = defineComponent({
-  name: "FormCascader",
-  props: {
-    options: {
-      type: Array,
-      default: () => []
-    },
-    deep: {
-      type: [Number, String],
-      required: true
-    },
-    urlConfig: {
-      type: Object
-    },
-    onChange: {},
-    value: {}
-  },
-  emits: ["update:value"],
-  setup(props, {
-    slots,
-    emit
-  }) {
-    const _options = ref(null);
-    const {
-      title
-    } = useFormField();
-    const asyncQueue = inject(InjectAsyncQueue);
-    async function fetchData(option) {
-      var _a;
-      if (!option && _options.value)
-        return;
-      const config = props.urlConfig;
-      if (!config)
-        return;
-      if (!isObject(config)) {
-        formRenderLog(`invalid urlConfig (${config}) in CASCADER => ${title.value}`, "warn");
-        return;
-      }
-      if ((option == null ? void 0 : option.depth) + 1 >= props.deep)
-        return;
-      const parentDepth = (_a = option == null ? void 0 : option.depth) != null ? _a : -1;
-      const params = {
-        lvlnr: parentDepth + 1 + ""
-      };
-      if (option) {
-        if (!config.dependKey) {
-          formRenderLog(`invalid urlConfig.dependKey ${config.dependKey} in CASCADER => ${title.value}`, "warn");
-          return;
-        }
-        arrayed(config.dependKey).forEach((key) => {
-          if (isString(key)) {
-            params[key] = option[config.valueKey];
-          } else if (isObject(key)) {
-            params[key.paramName] = option[key.paramValue];
-          }
-        });
-      }
-      let data = await asyncQueue.addAsync({
-        ...config,
-        key: title.value,
-        params
-      });
-      if (!Array.isArray(data)) {
-        data = [];
-      }
-      if (!data.length && isObject(option)) {
-        option.isLeaf = true;
-        let currentOption = option;
-        const result2 = [option];
-        while (currentOption.parent) {
-          result2.unshift(currentOption.parent);
-          currentOption = currentOption.parent;
-        }
-        updateValue(null, null, result2);
-        return;
-      }
-      const result = data.reduce((res, d) => {
-        res.push({
-          [config.nameKey]: d[config.nameKey],
-          [config.valueKey]: d[config.valueKey],
-          depth: parentDepth + 1,
-          parent: option,
-          isLeaf: parentDepth + 2 >= props.deep
-        });
-        return res;
-      }, []);
-      option ? option.children = result : _options.value = result;
-    }
-    const renderOptions = computed(() => {
-      return _options.value || props.options || [];
-    });
-    watch(() => props.value, (n, o) => {
-      if (n != null && o == null) {
-        fetchData();
-      }
-    }, {
-      immediate: true
-    });
-    const labelKey = computed(() => {
-      var _a, _b;
-      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text";
-    });
-    const valueKey = computed(() => {
-      var _a, _b;
-      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
-    });
-    const _value = computed(() => {
-      try {
-        const parsed = Array.isArray(props.value) ? props.value : JSON.parse(props.value || "");
-        if (Array.isArray(parsed)) {
-          return parsed.map((option) => option[labelKey.value]).join(" / ");
-        }
-      } catch (e) {
-        return "";
-      }
-    });
-    function updateValue(_, __, options) {
-      const payload = Array.isArray(options) ? options.map((option) => ({
-        ...option,
-        label: option[labelKey.value],
-        children: void 0,
-        parent: void 0
-      })) : options;
-      emit("update:value", payload);
-    }
-    const show = ref(false);
-    function updateShow(v) {
-      show.value = !!v;
-      v && fetchData();
-    }
-    return () => {
-      return createVNode(NCascader, {
-        "value": _value.value,
-        "show": !!show.value,
-        "onUpdate:value": updateValue,
-        "remote": true,
-        "labelField": labelKey.value,
-        "valueField": valueKey.value,
-        "options": renderOptions.value,
-        "checkStrategy": "child",
-        "onLoad": fetchData,
-        "onUpdate:show": updateShow
-      }, slots);
-    };
-  }
-});
-const SEARCH_CASCADE = connect(script, mapProps({
-  dataSource: "options"
-}, assignUpdateValue));
-
-export { SEARCH_CASCADE };
+export { SEARCH_CASCADE } from './cascader2.js';

package/es/packages/form-render/src/components/renderer/cascader2.js

@@ -0,0 +1,167 @@
+import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
+import { isObject, isString } from 'lodash-es';
+import { InjectAsyncQueue } from '../../constants/index2.js';
+import { assignUpdateValue, formRenderLog, arrayed } from '../../utils/index2.js';
+import '../../../../packages/form-render';
+import '@vueuse/core';
+import { useFormField } from '../../hooks/useFormField2.js';
+import '../../../../packages/form-render/src/utils';
+import '../../../../src/utils/anime';
+import '../../../../packages/form-render/src/constants';
+import { connect, mapProps } from '@formily/vue';
+import '../../../../packages/form-render/src/components/renderer';
+import { NCascader } from 'naive-ui';
+
+const script = defineComponent({
+  name: "FormCascader",
+  props: {
+    options: {
+      type: Array,
+      default: () => []
+    },
+    deep: {
+      type: [Number, String],
+      required: true
+    },
+    urlConfig: {
+      type: Object
+    },
+    onChange: {},
+    value: {}
+  },
+  emits: ["update:value"],
+  setup(props, {
+    slots,
+    emit
+  }) {
+    const _options = ref(null);
+    const {
+      title
+    } = useFormField();
+    const asyncQueue = inject(InjectAsyncQueue);
+    async function fetchData(option) {
+      var _a;
+      if (!option && _options.value)
+        return;
+      const config = props.urlConfig;
+      if (!config)
+        return;
+      if (!isObject(config)) {
+        formRenderLog(`invalid urlConfig (${config}) in CASCADER => ${title.value}`, "warn");
+        return;
+      }
+      if ((option == null ? void 0 : option.depth) + 1 >= props.deep)
+        return;
+      const parentDepth = (_a = option == null ? void 0 : option.depth) != null ? _a : -1;
+      const params = {
+        lvlnr: parentDepth + 1 + ""
+      };
+      if (option) {
+        if (!config.dependKey) {
+          formRenderLog(`invalid urlConfig.dependKey ${config.dependKey} in CASCADER => ${title.value}`, "warn");
+          return;
+        }
+        arrayed(config.dependKey).forEach((key) => {
+          if (isString(key)) {
+            params[key] = option[config.valueKey];
+          } else if (isObject(key)) {
+            params[key.paramName] = option[key.paramValue];
+          }
+        });
+      }
+      let data = await asyncQueue.addAsync({
+        ...config,
+        key: title.value,
+        params
+      });
+      if (!Array.isArray(data)) {
+        data = [];
+      }
+      if (!data.length && isObject(option)) {
+        option.isLeaf = true;
+        let currentOption = option;
+        const result2 = [option];
+        while (currentOption.parent) {
+          result2.unshift(currentOption.parent);
+          currentOption = currentOption.parent;
+        }
+        updateValue(null, null, result2);
+        return;
+      }
+      const result = data.reduce((res, d) => {
+        res.push({
+          [config.nameKey]: d[config.nameKey],
+          [config.valueKey]: d[config.valueKey],
+          depth: parentDepth + 1,
+          parent: option,
+          isLeaf: parentDepth + 2 >= props.deep
+        });
+        return res;
+      }, []);
+      option ? option.children = result : _options.value = result;
+    }
+    const renderOptions = computed(() => {
+      return _options.value || props.options || [];
+    });
+    watch(() => props.value, (n, o) => {
+      if (n != null && o == null) {
+        fetchData();
+      }
+    }, {
+      immediate: true
+    });
+    const labelKey = computed(() => {
+      var _a, _b;
+      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.nameKey) != null ? _b : "text";
+    });
+    const valueKey = computed(() => {
+      var _a, _b;
+      return (_b = (_a = props.urlConfig) == null ? void 0 : _a.valueKey) != null ? _b : "value";
+    });
+    const _value = computed(() => {
+      try {
+        const parsed = Array.isArray(props.value) ? props.value : JSON.parse(props.value || "");
+        if (Array.isArray(parsed)) {
+          return parsed.map((option) => option[labelKey.value]).join(" / ");
+        } else {
+          return [];
+        }
+      } catch (e) {
+        return "";
+      }
+    });
+    function updateValue(_, __, options) {
+      const payload = Array.isArray(options) ? options.map((option) => ({
+        ...option,
+        label: option[labelKey.value],
+        children: void 0,
+        parent: void 0
+      })) : options;
+      emit("update:value", payload);
+    }
+    const show = ref(false);
+    function updateShow(v) {
+      show.value = !!v;
+      v && fetchData();
+    }
+    return () => {
+      return createVNode(NCascader, {
+        "value": _value.value,
+        "show": !!show.value,
+        "onUpdate:value": updateValue,
+        "remote": true,
+        "labelField": labelKey.value,
+        "valueField": valueKey.value,
+        "options": renderOptions.value,
+        "checkStrategy": "child",
+        "onLoad": fetchData,
+        "onUpdate:show": updateShow
+      }, slots);
+    };
+  }
+});
+const SEARCH_CASCADE = connect(script, mapProps({
+  dataSource: "options"
+}, assignUpdateValue));
+
+export { SEARCH_CASCADE };

package/es/packages/form-render/src/components/renderer/checkbox.d.ts

@@ -1,5 +1,5 @@
 import { AnyObject } from '../../../../../../es/src/types';
-import { PropType } from "vue";
+import { PropType } from 'vue';
 export declare const CHECKBOX: import("vue").DefineComponent<{
     options: {
         type: PropType<AnyObject[]>;

package/es/packages/form-render/src/components/renderer/checkbox.js

@@ -1,42 +1 @@
-import { defineComponent, createVNode } from 'vue';
-import { assignUpdateValue } from '../../utils/index.js';
-import { connect, mapProps } from '@formily/vue';
-import { NCheckboxGroup, NSpace, NCheckbox } from 'naive-ui';
-
-const script = defineComponent({
-  name: "FormCheckbox",
-  props: {
-    options: {
-      type: Array,
-      default: () => []
-    },
-    vertical: {
-      type: Boolean,
-      default: false
-    }
-  },
-  setup(props, {
-    attrs
-  }) {
-    return () => createVNode(NCheckboxGroup, attrs, {
-      default: () => [createVNode(NSpace, {
-        "vertical": props.vertical
-      }, {
-        default: () => {
-          var _a;
-          return [(_a = props.options) == null ? void 0 : _a.map((option) => createVNode(NCheckbox, {
-            "key": option.value,
-            "value": option.value
-          }, {
-            default: () => [option.text]
-          }))];
-        }
-      })]
-    });
-  }
-});
-const CHECKBOX = connect(script, mapProps({
-  dataSource: "options"
-}, assignUpdateValue));
-
-export { CHECKBOX };
+export { CHECKBOX } from './checkbox2.js';

package/es/packages/form-render/src/components/renderer/checkbox2.js

@@ -0,0 +1,42 @@
+import { defineComponent, createVNode } from 'vue';
+import { assignUpdateValue } from '../../utils/index2.js';
+import { connect, mapProps } from '@formily/vue';
+import { NCheckboxGroup, NSpace, NCheckbox } from 'naive-ui';
+
+const script = defineComponent({
+  name: "FormCheckbox",
+  props: {
+    options: {
+      type: Array,
+      default: () => []
+    },
+    vertical: {
+      type: Boolean,
+      default: false
+    }
+  },
+  setup(props, {
+    attrs
+  }) {
+    return () => createVNode(NCheckboxGroup, attrs, {
+      default: () => [createVNode(NSpace, {
+        "vertical": props.vertical
+      }, {
+        default: () => {
+          var _a;
+          return [(_a = props.options) == null ? void 0 : _a.map((option) => createVNode(NCheckbox, {
+            "key": option.value,
+            "value": option.value
+          }, {
+            default: () => [option.text]
+          }))];
+        }
+      })]
+    });
+  }
+});
+const CHECKBOX = connect(script, mapProps({
+  dataSource: "options"
+}, assignUpdateValue));
+
+export { CHECKBOX };