cnhis-design-vue 3.1.14-beta.8 → 3.1.15-beta.0

package/es/packages/form-render/index.d.ts

@@ -408,9 +408,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         title: string;
     }[]>;
     formHeight: import("vue").ComputedRef<any>;
-    scrollTo: (id: string) => Promise<void>;
     onScroll: () => void;
-    bindInfo: (info: import("../../../es/src/types").AnyObject) => import("../../../es/src/types").AnyObject;
     queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: import("./src/types").FieldItem[]) => Promise<{
         widgetElement: HTMLInputElement | null | undefined;
         widgetElementList: HTMLInputElement[];

package/es/packages/form-render/index.js

@@ -1,7 +1,6 @@
 import { COMPONENT_NAMESPACE } from '../../src/global/variable';
 import { safeComponentRegister } from '../../src/utils';
-import './src/FormRender.js';
-import script from './src/FormRender.vue_vue_type_script_setup_true_lang.js';
+import FormRender$1 from './src/FormRender.js';
 export { useFieldListAdaptor } from './src/hooks/useFieldListAdaptor.js';
 export { useFormRequest } from './src/hooks/useFormRequest.js';
 export { useCommonLog } from './src/hooks/useCommonLog.js';
@@ -17,7 +16,7 @@ export { useInitialData } from './src/hooks/useInitialData.js';
 export { useAnchor } from './src/hooks/useAnchor.js';
 export { useFormContext } from './src/hooks/useFormContext.js';
 
-const FormRender = script;
+const FormRender = FormRender$1;
 FormRender.install = function(app) {
   safeComponentRegister(app, FormRender, COMPONENT_NAMESPACE + "FormRender");
 };

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

@@ -1,4 +1,204 @@
-import script from './FormRender.vue_vue_type_script_setup_true_lang.js';
-export { default } from './FormRender.vue_vue_type_script_setup_true_lang.js';
+import { defineComponent, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, renderSlot, toDisplayString, nextTick } from 'vue';
+import { createForm, onFieldValueChange, isField } from '@formily/core';
+import { FormProvider, FormConsumer } from '@formily/vue';
+import { cloneDeep, isArray, isObject } from 'lodash-es';
+import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
+import { FormItemLineBarDepKeyPrepend } from '../../../packages/form-render/src/constants';
+import { arrayed, queryDecorator, queryInput, getParentLinebar } from '../../../packages/form-render/src/utils';
+import { useNuiThemeOverrides } from '../../../packages/form-table/src/hooks/useNuiThemeOverrides';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
+import { useFormContext } from './hooks/useFormContext.js';
+import { useInitialData } from './hooks/useInitialData.js';
+import { useFieldListAdaptor } from './hooks/useFieldListAdaptor.js';
+import { useFieldVisitor } from './hooks/useFieldVisitor.js';
+import { useAnchor } from './hooks/useAnchor.js';
 
-script.__file = "packages/form-render/src/FormRender.vue";
+const _hoisted_1 = {
+  key: 0,
+  style: { "height": "50px" }
+};
+const _hoisted_2 = { style: { "white-space": "pre" } };
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "FormRender",
+  props: {
+    fieldList: { type: Array },
+    initialData: { type: Object, default: () => ({}) },
+    fieldVisitor: { type: Object },
+    column: { type: Number, default: 12 },
+    maxHeight: { type: [Number, String], default: "" },
+    anchor: { type: Boolean, default: false },
+    parallelism: { type: Number, default: 3 },
+    schema: { type: Object },
+    components: {
+      type: Object,
+      default: () => ({})
+    },
+    businessFilter: { type: Function },
+    scope: { type: Object, default: () => ({}) },
+    annotation: { type: Object },
+    consumer: { type: Boolean, default: false },
+    uuid: { type: String }
+  },
+  emits: [
+    "formChange"
+  ],
+  setup(__props, { expose, emit }) {
+    const props = __props;
+    const { nuiThemeOverrides } = useNuiThemeOverrides();
+    const { SchemaField, businessCollector, formItemDepsCollector, changeContextCollector, formUUID } = useFormContext(props);
+    const formModel = createForm({
+      initialValues: useInitialData().assignInitialData(props.initialData, props.fieldList),
+      effects() {
+        onFieldValueChange("*", (field) => {
+          const fieldKey = field.props.name.toString();
+          emit("formChange", {
+            fieldInstance: field,
+            fieldKey,
+            fieldName: field.title,
+            value: field.value,
+            context: changeContextCollector.getContext(fieldKey)
+          });
+          businessCollector.trigger(formModel, fieldKey, field.value);
+          formItemDepsCollector.trigger(fieldKey);
+        });
+      }
+    });
+    const { schemaAdaptor } = useFieldListAdaptor(businessCollector, formUUID);
+    const parsedSchema = computed(() => {
+      if (props.schema) {
+        return props.schema;
+      }
+      if (props.fieldList) {
+        const _fieldList = useFieldVisitor().traverse(cloneDeep(props.fieldList), props.fieldVisitor);
+        return { type: "object", properties: schemaAdaptor(_fieldList) };
+      }
+      return { type: "object", properties: {} };
+    });
+    const { currentAnchor, scrollbarRef, generateAnchorList, anchorIdList, formHeight, onScroll } = useAnchor(props, formItemDepsCollector);
+    watch(parsedSchema, generateAnchorList, { immediate: true });
+    async function queryWidget(key, wrapperElement, fieldList) {
+      if (!scrollbarRef.value)
+        return createResult();
+      const decoratorElement = queryDecorator(key, wrapperElement, formUUID);
+      if (decoratorElement)
+        return createResult(decoratorElement);
+      const parentLinebarKey = getParentLinebar(key, fieldList);
+      if (!parentLinebarKey)
+        return createResult();
+      formItemDepsCollector.trigger(FormItemLineBarDepKeyPrepend + parentLinebarKey, true);
+      await nextTick();
+      return createResult(queryDecorator(key, wrapperElement, formUUID));
+      function createResult(decoratorElement2) {
+        return { decoratorElement: decoratorElement2, ...queryInput(decoratorElement2) };
+      }
+    }
+    expose({
+      validate(path = "*") {
+        return formModel.validate(path).catch((err) => {
+          return Promise.reject(Array.isArray(err) ? err.reduce(errInfoNormalize, []) : err);
+        });
+        function errInfoNormalize(result, error) {
+          let childMessageNum = 0;
+          if (isArray(error.messages)) {
+            error.messages.forEach((message) => {
+              if (!isObject(message))
+                return;
+              result.push(...arrayed(message).map(bindInfo));
+              childMessageNum++;
+            });
+          }
+          !childMessageNum && result.push(bindInfo(error));
+          return result;
+        }
+        function bindInfo(info) {
+          if (info.decoratorElement)
+            return info;
+          info.title = formModel.query(info.path).get("title");
+          info.decoratorElement = queryDecorator(info.path, scrollbarRef.value, formUUID);
+          Object.assign(info, queryInput(info.decoratorElement));
+          return info;
+        }
+      },
+      getFormValues() {
+        return formModel.getFormState().values;
+      },
+      setFieldState(path, handler) {
+        formModel.setFieldState(path, handler);
+      },
+      resetFields(path = "*") {
+        formModel.setFieldState(path, (field) => {
+          var _a;
+          if (isField(field)) {
+            field.modified = false;
+            field.visited = false;
+            field.feedbacks = [];
+            field.selfModified = false;
+            field.caches = {};
+            field.value = (_a = field.initialValue) != null ? _a : null;
+          }
+        });
+      },
+      async queryWidget(key) {
+        return scrollbarRef.value ? await queryWidget(key, scrollbarRef.value, props.fieldList || []) : null;
+      }
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(unref(NForm), {
+        class: "form-render",
+        "require-mark-placement": "left"
+      }, {
+        default: withCtx(() => [
+          __props.anchor ? (openBlock(), createElementBlock("section", _hoisted_1, [
+            createVNode(unref(NTabs), {
+              value: unref(currentAnchor),
+              "onUpdate:value": _cache[0] || (_cache[0] = ($event) => isRef(currentAnchor) ? currentAnchor.value = $event : null),
+              type: "line"
+            }, {
+              default: withCtx(() => [
+                (openBlock(true), createElementBlock(Fragment, null, renderList(unref(anchorIdList), (anchor) => {
+                  return openBlock(), createBlock(unref(NTabPane), {
+                    name: anchor.name,
+                    tab: anchor.title,
+                    key: anchor.name
+                  }, null, 8, ["name", "tab"]);
+                }), 128))
+              ]),
+              _: 1
+            }, 8, ["value"])
+          ])) : createCommentVNode("v-if", true),
+          createVNode(unref(NConfigProvider), { "theme-overrides": unref(nuiThemeOverrides) }, {
+            default: withCtx(() => [
+              createElementVNode("section", {
+                class: "form-render__wrapper",
+                style: normalizeStyle({ "--column": __props.column, "--form-height": unref(formHeight) }),
+                ref_key: "scrollbarRef",
+                ref: scrollbarRef,
+                onScroll: _cache[1] || (_cache[1] = (...args) => unref(onScroll) && unref(onScroll)(...args))
+              }, [
+                createVNode(unref(FormProvider), { form: unref(formModel) }, {
+                  default: withCtx(() => [
+                    renderSlot(_ctx.$slots, "default", { schemaFiled: unref(SchemaField) }, () => [
+                      createVNode(unref(SchemaField), { schema: unref(parsedSchema) }, null, 8, ["schema"])
+                    ]),
+                    __props.consumer ? (openBlock(), createBlock(unref(FormConsumer), { key: 0 }, {
+                      default: withCtx(({ form }) => [
+                        createElementVNode("div", _hoisted_2, toDisplayString(JSON.stringify(form.values, null, 2)), 1)
+                      ]),
+                      _: 1
+                    })) : createCommentVNode("v-if", true)
+                  ]),
+                  _: 3
+                }, 8, ["form"])
+              ], 36)
+            ]),
+            _: 3
+          }, 8, ["theme-overrides"])
+        ]),
+        _: 3
+      });
+    };
+  }
+});
+var FormRender = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "FormRender.vue"]]);
+
+export { FormRender as default };

package/es/packages/form-render/src/FormRender.vue.d.ts

@@ -408,9 +408,7 @@ declare const _default: import("vue").DefineComponent<{
         title: string;
     }[]>;
     formHeight: import("vue").ComputedRef<any>;
-    scrollTo: (id: string) => Promise<void>;
     onScroll: () => void;
-    bindInfo: (info: AnyObject) => AnyObject;
     queryWidget: (key: string, wrapperElement: HTMLElement, fieldList: FieldItem[]) => Promise<{
         widgetElement: HTMLInputElement | null | undefined;
         widgetElementList: HTMLInputElement[];

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

@@ -6,18 +6,18 @@ declare type DependKeyObj = {
     paramValue: string;
 };
 declare type UrlConfig = {
-    method: FormRequestType;
-    nameKey: string;
-    dependKey: ArrayAble<string> | ArrayAble<DependKeyObj>;
+    method?: FormRequestType;
+    nameKey?: string;
+    valueKey?: string;
+    dependKey?: ArrayAble<string> | Record<string, string> | ArrayAble<DependKeyObj>;
     url: string;
-    valueKey: string;
 };
 export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
     options: {
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
-    deep: {
+    depth: {
         type: (NumberConstructor | StringConstructor)[];
         required: true;
     };
@@ -34,7 +34,7 @@ export declare const SEARCH_CASCADE: import("vue").DefineComponent<{
         type: PropType<AnyObject[]>;
         default: () => never[];
     };
-    deep: {
+    depth: {
         type: (NumberConstructor | StringConstructor)[];
         required: true;
     };

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

@@ -1,8 +1,8 @@
-import { defineComponent, ref, inject, computed, watch, createVNode } from 'vue';
+import { defineComponent, ref, computed, inject, watch, createVNode } from 'vue';
 import { isField } from '@formily/core';
-import { isObject, isString } from 'lodash-es';
+import { isEqual } from 'lodash-es';
 import { InjectAsyncQueue } from '../../constants/index.js';
-import { assignUpdateValue, formRenderLog, arrayed } from '../../utils/index.js';
+import { assignUpdateValue, traverseDependKey } from '../../utils/index.js';
 import { connect, mapProps } from '@formily/vue';
 import { NCascader } from 'naive-ui';
 import { useFormField } from '../../hooks/useFormField.js';
@@ -14,7 +14,7 @@ const script = defineComponent({
       type: Array,
       default: () => []
     },
-    deep: {
+    depth: {
       type: [Number, String],
       required: true
     },
@@ -32,59 +32,69 @@ const script = defineComponent({
     slots,
     emit
   }) {
-    const _options = ref(null);
-    const asyncQueue = inject(InjectAsyncQueue);
+    const remoteOptions = ref();
     const {
       field,
       title
     } = useFormField();
-    async function fetchData(option) {
-      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;
+    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) || !parsed.length)
+          return null;
+        return parsed.map((option) => option[labelKey.value]).join(" / ");
+      } catch (e) {
+        return null;
       }
-      if (deepFor(option) + 1 >= props.deep)
-        return;
-      let data = await asyncQueue.addAsync({
-        ...createRequestParams(deepFor(option), config, option),
-        key: title.value
-      });
-      if (!Array.isArray(data)) {
-        data = [];
+    });
+    function updateValue(_, __, options) {
+      emit("update:value", options.map(optionSimplify));
+      function optionSimplify(option) {
+        return {
+          ...option,
+          label: option[labelKey.value],
+          children: void 0,
+          parent: void 0
+        };
       }
-      if (!data.length && isObject(option)) {
+    }
+    const asyncQueue = inject(InjectAsyncQueue);
+    async function fetchData(option) {
+      if (notNeedToFetchData(props, option))
+        return;
+      const data = await asyncQueue.addAsync(createRequestParams(deepFor(option), configFor(props), title.value, option));
+      if (!data.length && option) {
         option.isLeaf = true;
         updateValue(null, null, getOptionChain(option));
         show.value = false;
         return;
       }
       const result = data.map((item) => optionNormalize(item, deepFor(option)));
-      option ? option.children = result : _options.value = result;
-      function deepFor(option2) {
-        var _a;
-        return (_a = option2 == null ? void 0 : option2.depth) != null ? _a : -1;
+      option ? option.children = result : remoteOptions.value = result;
+      function notNeedToFetchData(props2, option2) {
+        return !configFor(props2) || !option2 && remoteOptions.value || deepFor(option2) >= deepFor(props2) - 1;
       }
-      function createRequestParams(deep, config2, option2) {
+      function createRequestParams(deep, config, key, option2) {
         const params = {
           lvlnr: deep + 1 + ""
         };
-        if (option2 && config2.dependKey) {
-          arrayed(config2.dependKey).forEach((key) => {
-            if (isString(key)) {
-              params[key] = option2[valueKey.value];
-            } else if (isObject(key)) {
-              params[key.paramName] = option2[key.paramValue];
-            }
+        if (option2 && config.dependKey) {
+          traverseDependKey(config.dependKey, (dependKey, valueKey2) => {
+            params[valueKey2] = option2[dependKey];
           });
         }
         return {
           params,
-          ...config2
+          ...config,
+          key
         };
       }
       function getOptionChain(option2) {
@@ -96,66 +106,44 @@ const script = defineComponent({
         }
         return result2;
       }
-      function optionNormalize(data2, deep) {
+      function optionNormalize(data2, depth) {
         return {
           [labelKey.value]: data2[labelKey.value],
           [valueKey.value]: data2[valueKey.value],
-          depth: deep + 1,
+          depth: depth + 1,
           parent: option,
-          isLeaf: deep + 2 >= props.deep
+          isLeaf: depth + 2 >= deepFor(props)
         };
       }
+      function configFor(target) {
+        return target.urlConfig;
+      }
+      function deepFor(target) {
+        var _a;
+        return (_a = target == null ? void 0 : target.depth) != null ? _a : -1;
+      }
     }
-    const renderOptions = computed(() => {
-      return _options.value || props.options || [];
-    });
     watch(() => props.value, (n, o) => {
       var _a, _b;
-      if (n != null && o == null) {
-        fetchData();
-      }
-      if (isField(field.value) && field.value.visited) {
-        (_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a);
-      }
+      n != null && o == null && fetchData();
+      isField(field.value) && field.value.visited && ((_b = (_a = field.value).validate) == null ? void 0 : _b.call(_a));
     }, {
       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 "";
-      }
+    watch(() => props.urlConfig, async (config, oldConfig) => {
+      if (isEqual(config, oldConfig))
+        return;
+      remoteOptions.value = null;
+      await fetchData();
     });
-    function updateValue(_, __, options) {
-      emit("update:value", options.map(optionSimplify));
-      function optionSimplify(option) {
-        return {
-          ...option,
-          label: option[labelKey.value],
-          children: void 0,
-          parent: void 0
-        };
-      }
-    }
     const show = ref(false);
     function updateShow(v) {
       show.value = !!v;
       v && fetchData();
     }
+    const parsedOptions = computed(() => {
+      return remoteOptions.value || props.options || [];
+    });
     function focusDecorator(onFocus) {
       return (...args) => {
         if (isField(field.value)) {
@@ -166,17 +154,17 @@ const script = defineComponent({
     }
     return () => {
       return createVNode(NCascader, {
-        "value": _value.value,
+        "remote": true,
+        "checkStrategy": "child",
         "show": !!show.value,
+        "onUpdate:show": updateShow,
+        "value": _value.value,
         "onUpdate:value": updateValue,
-        "remote": true,
         "labelField": labelKey.value,
         "valueField": valueKey.value,
-        "options": renderOptions.value,
-        "checkStrategy": "child",
+        "options": parsedOptions.value,
         "onLoad": fetchData,
-        "onFocus": focusDecorator(props.onFocus),
-        "onUpdate:show": updateShow
+        "onFocus": focusDecorator(props.onFocus)
       }, slots);
     };
   }

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

@@ -8,6 +8,9 @@ export declare const COMBINATION: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
     };
+    maxGroupNum: {
+        type: NumberConstructor;
+    };
     getProperties: {
         type: PropType<() => FieldItem[]>;
         default: () => never[];
@@ -20,6 +23,9 @@ export declare const COMBINATION: import("vue").DefineComponent<{
     value: {
         type: StringConstructor;
     };
+    maxGroupNum: {
+        type: NumberConstructor;
+    };
     getProperties: {
         type: PropType<() => FieldItem[]>;
         default: () => never[];