cnhis-design-vue 3.1.26-beta.2 → 3.1.26-beta.4

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

@@ -1,6 +1,6 @@
 import { COMPONENT_NAMESPACE } from '../../shared/global/variable.js';
 import { safeComponentRegister } from '../../shared/utils/index.js';
-import script from './src/FormRender.js';
+import script from './src/FormRenderWrapper.js';
 export { useFieldListAdaptor } from './src/hooks/useFieldListAdaptor.js';
 export { useFormRequest } from './src/hooks/useFormRequest.js';
 export { useCommonLog } from './src/hooks/useCommonLog.js';
@@ -16,7 +16,11 @@ export { useAnchor } from './src/hooks/useAnchor.js';
 export { useAutographOptions } from './src/hooks/useAutographOptions.js';
 export { useFormContext } from './src/hooks/useFormContext.js';
 export { useCommonInjection, useSelectOptionProps } from './src/hooks/useCommonInjection.js';
+export { combineExtendKey, createInputSlot, createSlot, formRenderLog, injectOrProvide, mergeDeepProperties, optionMatcher, parseNumberFromMaybeString, presetRequestHandler, splitExtendKey, validateMessageParser } from './src/utils/index.js';
 export * from '@formily/core';
+export { businessDateParser, isIdCard, isMobile, parseAge2Birthday, parseAge2FromContext, parseBirthday, parseIdCard, transformDateFormat } from './src/utils/business.js';
+export { queryDecorator, queryInput } from './src/utils/dom.js';
+export { assignClearBindVisited, assignUpdateValue, assignValueBindKey, createLinebarId, createObjSchema, dotEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseSchema, visitedDecorator } from './src/utils/schema.js';
 
 const FormRender = script;
 FormRender.install = function(app) {

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

@@ -1,6 +1,6 @@
 import { defineComponent, ref, computed, watch, openBlock, createBlock, unref, withCtx, createElementBlock, createVNode, isRef, Fragment, renderList, createCommentVNode, createElementVNode, normalizeStyle, toDisplayString, nextTick } from 'vue';
 import { arrayed } from '../../../shared/utils/index.js';
-import { createForm, onFieldValueChange } from '@formily/core';
+import { createForm, onFieldValueChange, isField } from '@formily/core';
 import { FormProvider, FormConsumer } from '@formily/vue';
 import { isObject } from '@vue/shared';
 import { cloneDeep, isArray } from 'lodash-es';
@@ -8,7 +8,7 @@ import { NForm, NTabs, NTabPane, NConfigProvider } from 'naive-ui';
 import { FormItemLineBarDepKeyPrepend } from './constants/index.js';
 import { useFormRenderLifeCycle } from './hooks/useFormRenderLifeCycle.js';
 import { useNuiThemeOverrides } from './hooks/useNuiThemeOverrides.js';
-import { validateMessageParser } from './utils/index.js';
+import { validateMessageParser, combineExtendKey, splitExtendKey } from './utils/index.js';
 import { useFieldListAdaptor } from './hooks/useFieldListAdaptor.js';
 import '../index.js';
 import { useFieldVisitor } from './hooks/useFieldVisitor.js';
@@ -88,12 +88,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     );
     const scrollbarRef = ref();
     const { schemaAdaptor } = useFieldListAdaptor(businessCollector);
+    let _fieldList = props.fieldList || [];
     const parsedSchema = computed(() => {
       if (props.schema) {
         return props.schema;
       }
       if (props.fieldList) {
-        const _fieldList = useFieldVisitor().traverse(cloneDeep(props.fieldList), props.fieldVisitor);
+        _fieldList = useFieldVisitor().traverse(cloneDeep(props.fieldList), props.fieldVisitor);
         return createObjSchema(schemaAdaptor(_fieldList));
       }
       return createObjSchema({});
@@ -157,8 +158,21 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           return validateMessageParser(message, decoratorProps.fieldItem);
         }
       },
-      getFormValues() {
-        return formModel.getFormState().values;
+      getFormValues(needCombineExtendKey = true) {
+        const result = formModel.getFormState().values;
+        if (!needCombineExtendKey)
+          return result;
+        return combineExtendKey(_fieldList, result);
+      },
+      setFormValues(values, needSplitExtendKey = true) {
+        if (needSplitExtendKey) {
+          values = splitExtendKey(_fieldList, values);
+        }
+        formModel.setFieldState("*", (state) => {
+          if (!isField(state) || Reflect.has(values, state.path.toString()))
+            return;
+          state.value = values[state.path.toString()];
+        });
       },
       setFieldState(path, handler) {
         formModel.setFieldState(path, handler);
@@ -167,7 +181,10 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         formModel.reset(path);
       },
       async queryWidget(key) {
-        return scrollbarRef.value ? await queryWidget(key, scrollbarRef.value, props.fieldList || []) : null;
+        return scrollbarRef.value ? await queryWidget(key, scrollbarRef.value, _fieldList) : null;
+      },
+      async reload() {
+        console.error("reload function is abstract,it should be overwrite!");
       }
     });
     return (_ctx, _cache) => {
@@ -225,6 +242,6 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-var script = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "FormRender.vue"]]);
+var FormRender = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "FormRender.vue"]]);
 
-export { script as default };
+export { FormRender as default };

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

@@ -301,6 +301,7 @@ declare const _default: import("vue").DefineComponent<{
         "x-read-pretty"?: boolean | undefined;
         "x-compile-omitted"?: string[] | undefined;
     }>>;
+    _fieldList: FieldItem[];
     parsedSchema: import("vue").ComputedRef<import("@formily/vue").Stringify<{
         [key: symbol]: any;
         [key: `x-${string}`]: any;

package/es/components/form-render/src/FormRenderWrapper.js

@@ -0,0 +1,46 @@
+import { defineComponent, ref, openBlock, createBlock, nextTick } from 'vue';
+import FormRender from './FormRender.js';
+import _export_sfc from '../../../_virtual/plugin-vue_export-helper.js';
+
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "FormRenderWrapper",
+  setup(__props, { expose }) {
+    const formRenderRef = ref();
+    const key = ref(0);
+    async function reload() {
+      key.value++;
+      await nextTick();
+    }
+    const formRenderExposeKeyList = [
+      "validate",
+      "getFormValues",
+      "setFormValues",
+      "setFieldState",
+      "resetFieldState",
+      "resetFields",
+      "queryWidget"
+    ];
+    const exposed = formRenderExposeKeyList.reduce((res, key2) => {
+      res[key2] = (...args) => {
+        var _a;
+        return (_a = formRenderRef.value) == null ? void 0 : _a[key2](...args);
+      };
+      return res;
+    }, {});
+    expose({
+      ...exposed,
+      reload
+    });
+    return (_ctx, _cache) => {
+      return openBlock(), createBlock(FormRender, {
+        key: key.value,
+        ref_key: "formRenderRef",
+        ref: formRenderRef,
+        onReload: reload
+      });
+    };
+  }
+});
+var script = /* @__PURE__ */ _export_sfc(_sfc_main, [["__file", "FormRenderWrapper.vue"]]);
+
+export { script as default };