cnhis-design-vue 3.1.9-beta.8 → 3.1.10

package/es/packages/field-set/index.d.ts

@@ -1,4 +1,4 @@
-import { SFCWithInstall } from '..\..\../es/src/types';
+import { SFCWithInstall } from '../../../es/src/types';
 declare const FieldSet: SFCWithInstall<import("vue").DefineComponent<{
     type: {
         type: StringConstructor;

package/es/packages/field-set/index.js

@@ -1,5 +1,5 @@
-import { COMPONENT_NAMESPACE } from '..\\../src/global/variable';
-import { safeComponentRegister } from '..\\../src/utils';
+import { COMPONENT_NAMESPACE } from '../../src/global/variable';
+import { safeComponentRegister } from '../../src/utils';
 import './src/FieldSet.js';
 import script from './src/FieldSet.vue_vue_type_script_setup_true_lang.js';
 

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

@@ -1,4 +1,4 @@
-import { SFCWithInstall } from '..\..\../es/src/types';
+import { SFCWithInstall } from '../../../es/src/types';
 export * from './src/hooks';
 export * from './src/types';
 declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
@@ -6,7 +6,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         type: import("vue").PropType<import("./src/types").FieldItem[]>;
     };
     initialData: {
-        type: import("vue").PropType<import("..\..\../es/src/types").AnyObject>;
+        type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
         default: () => {};
     };
     fieldVisitor: {
@@ -84,7 +84,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         default: () => {};
     };
     scope: {
-        type: import("vue").PropType<import("..\..\../es/src/types").AnyObject>;
+        type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
         default: () => {};
     };
     consumer: {
@@ -97,7 +97,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
             type: import("vue").PropType<import("./src/types").FieldItem[]>;
         };
         initialData: {
-            type: import("vue").PropType<import("..\..\../es/src/types").AnyObject>;
+            type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
             default: () => {};
         };
         fieldVisitor: {
@@ -175,7 +175,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
             default: () => {};
         };
         scope: {
-            type: import("vue").PropType<import("..\..\../es/src/types").AnyObject>;
+            type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
             default: () => {};
         };
         consumer: {
@@ -251,7 +251,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         "x-read-pretty"?: boolean | undefined;
         "x-compile-omitted"?: string[] | undefined;
     }>>;
-    renderSchema: import("vue").ComputedRef<import("@formily/json-schema").Stringify<{
+    parsedSchema: import("vue").ComputedRef<import("@formily/json-schema").Stringify<{
         [key: symbol]: any;
         [key: `x-${string}`]: any;
         [key: `x-${number}`]: any;
@@ -308,11 +308,11 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         "x-read-pretty"?: boolean | undefined;
         "x-compile-omitted"?: string[] | undefined;
     }>>;
-    validate: () => any;
+    validate: () => Promise<void>;
+    FormConsumer: import("vue").DefineComponent<{}, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     FormProvider: import("vue").DefineComponent<Record<"form", any>, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<Record<"form", any>>>, {
         form: any;
     }>;
-    FormConsumer: import("vue").DefineComponent<{}, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     NForm: import("vue").DefineComponent<{
         readonly inline: BooleanConstructor;
         readonly labelWidth: import("vue").PropType<string | number>;
@@ -582,7 +582,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         type: import("vue").PropType<import("./src/types").FieldItem[]>;
     };
     initialData: {
-        type: import("vue").PropType<import("..\..\../es/src/types").AnyObject>;
+        type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
         default: () => {};
     };
     fieldVisitor: {
@@ -660,7 +660,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         default: () => {};
     };
     scope: {
-        type: import("vue").PropType<import("..\..\../es/src/types").AnyObject>;
+        type: import("vue").PropType<import("../../../es/src/types").AnyObject>;
         default: () => {};
     };
     consumer: {
@@ -672,9 +672,9 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
 }, {
     column: number;
     components: Record<string, import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions> | import("vue").FunctionalComponent<{}, {}>>;
-    initialData: import("..\..\../es/src/types").AnyObject;
+    initialData: import("../../../es/src/types").AnyObject;
     parallelism: number;
-    scope: import("..\..\../es/src/types").AnyObject;
+    scope: import("../../../es/src/types").AnyObject;
     consumer: boolean;
 }>>;
 export default FormRender;

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

@@ -1,5 +1,5 @@
-import { COMPONENT_NAMESPACE } from '..\\../src/global/variable';
-import { safeComponentRegister } from '..\\../src/utils';
+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';
 export { useFieldList2Schema } from './src/hooks/useFieldList2Schema.js';
@@ -13,6 +13,7 @@ export { useFormValidator } from './src/hooks/useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './src/hooks/useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './src/hooks/useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './src/hooks/useFormItemDeps.js';
+export { useInitialData } from './src/hooks/useInitialData.js';
 
 const FormRender = script;
 FormRender.install = function(app) {

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

@@ -1,6 +1,6 @@
-import { AnyObject } from '..\..\..\../es/src/types';
-import { FieldItem, FieldVisitor } from './types';
+import { AnyObject } from '../../../../es/src/types';
 import { Component, FunctionalComponent, PropType } from 'vue';
+import { FieldItem, FieldVisitor } from './types';
 declare const _default: import("vue").DefineComponent<{
     fieldList: {
         type: PropType<FieldItem[]>;
@@ -251,7 +251,7 @@ declare const _default: import("vue").DefineComponent<{
         "x-read-pretty"?: boolean | undefined;
         "x-compile-omitted"?: string[] | undefined;
     }>>;
-    renderSchema: import("vue").ComputedRef<import("@formily/vue").Stringify<{
+    parsedSchema: import("vue").ComputedRef<import("@formily/vue").Stringify<{
         [key: symbol]: any;
         [key: `x-${string}`]: any;
         [key: `x-${number}`]: any;
@@ -308,11 +308,11 @@ declare const _default: import("vue").DefineComponent<{
         "x-read-pretty"?: boolean | undefined;
         "x-compile-omitted"?: string[] | undefined;
     }>>;
-    validate: () => any;
+    validate: () => Promise<void>;
+    FormConsumer: import("vue").DefineComponent<{}, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     FormProvider: import("vue").DefineComponent<Record<"form", any>, unknown, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<Record<"form", any>>>, {
         form: any;
     }>;
-    FormConsumer: import("vue").DefineComponent<{}, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     NForm: import("vue").DefineComponent<{
         readonly inline: BooleanConstructor;
         readonly labelWidth: PropType<string | number>;

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

@@ -1,12 +1,13 @@
 import { defineComponent, provide, computed, openBlock, createBlock, unref, normalizeStyle, withCtx, createVNode, renderSlot, createElementVNode, toDisplayString, createCommentVNode } from 'vue';
-import { injectOrProvide } from './utils/index.js';
-import { cloneDeep } from 'lodash-es';
-import { InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectAsyncQueue, InjectionSchemaField } from './constants/index.js';
-import * as index from './components/index.js';
 import { createForm, onFieldValueChange } from '@formily/core';
 import { FormProvider, FormConsumer, createSchemaField } from '@formily/vue';
+import { cloneDeep } from 'lodash-es';
 import { NForm } from 'naive-ui';
+import * as index from './components/index.js';
+import { InjectionBusinessCollector, InjectionChangeContextCollector, InjectionFormItemDepsCollector, InjectAsyncQueue, InjectionSchemaField } from './constants/index.js';
+import { injectOrProvide } from './utils/index.js';
 import { useBusinessBinding } from './hooks/useBusinessBinding.js';
+import { useInitialData } from './hooks/useInitialData.js';
 import { useAsyncQueue } from './hooks/useAsyncQueue.js';
 import { useChangeContext } from './hooks/useChangeContext.js';
 import { useFormItemDeps } from './hooks/useFormItemDeps.js';
@@ -43,10 +44,11 @@ var script = /* @__PURE__ */ defineComponent({
     const formItemDepsCollector = useFormItemDeps().create();
     provide(InjectionFormItemDepsCollector, formItemDepsCollector);
     const formModel = createForm({
-      initialValues: props.initialData,
+      initialValues: useInitialData().assignInitialData(props.initialData, props.fieldList),
       effects() {
         onFieldValueChange("*", (field) => {
           const fieldKey = field.props.name.toString();
+          console.log("emitChange");
           emit("formChange", {
             fieldInstance: field,
             fieldKey,
@@ -60,12 +62,15 @@ var script = /* @__PURE__ */ defineComponent({
       }
     });
     const SchemaField = injectOrProvide(InjectionSchemaField, () => createSchemaField({
-      components: { ...index, ...props.components },
+      components: {
+        ...index,
+        ...props.components
+      },
       scope: props.scope
     }).SchemaField);
     const { traverse } = useFieldVisitor();
     const { transform } = useFieldList2Schema(businessCollector);
-    const renderSchema = computed(() => {
+    const parsedSchema = computed(() => {
       if (props.schema) {
         return props.schema;
       }
@@ -76,7 +81,16 @@ var script = /* @__PURE__ */ defineComponent({
       return { type: "object", properties: {} };
     });
     function validate() {
-      return formModel.validate();
+      return formModel.validate().catch((err) => {
+        if (Array.isArray(err)) {
+          return Promise.reject(err.map((e) => {
+            e.title = formModel.query(e.path).get("title");
+            return e;
+          }));
+        } else {
+          return Promise.reject(err);
+        }
+      });
     }
     expose({
       validate,
@@ -94,7 +108,7 @@ var script = /* @__PURE__ */ defineComponent({
           createVNode(unref(FormProvider), { form: unref(formModel) }, {
             default: withCtx(() => [
               renderSlot(_ctx.$slots, "default", { schemaFiled: unref(SchemaField) }, () => [
-                createVNode(unref(SchemaField), { schema: unref(renderSchema) }, null, 8, ["schema"])
+                createVNode(unref(SchemaField), { schema: unref(parsedSchema) }, null, 8, ["schema"])
               ]),
               __props.consumer ? (openBlock(), createBlock(unref(FormConsumer), { key: 0 }, {
                 default: withCtx(({ form }) => [

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

@@ -1,4 +1,4 @@
-import { AnyObject, ArrayAble } from '..\..\..\..\../es/src/types';
+import { AnyObject, ArrayAble } from '../../../../../es/src/types';
 import { FormRequestType } from '../types';
 import { PropType } from 'vue';
 declare type DependKeyObj = {

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

@@ -26,7 +26,6 @@ const script = defineComponent({
   emits: ["update:value"],
   setup(props, {
     slots,
-    attrs,
     emit
   }) {
     const _options = ref(null);

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

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

package/es/packages/form-render/src/components/complex.js

@@ -1,6 +1,6 @@
 import { defineComponent, createVNode } from 'vue';
 import { connect, mapProps } from '@formily/vue';
-import { assignUpdateValue } from '..\\..\\..\\../packages/form-render/src/utils';
+import { assignUpdateValue } from '../../../../packages/form-render/src/utils';
 
 const script = defineComponent({
   props: {

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

@@ -1,4 +1,4 @@
-import { AnyObject } from '..\..\..\..\../es/src/types';
+import { AnyObject } from '../../../../../es/src/types';
 import { PropType } from "vue";
 export declare const RADIO: import("vue").DefineComponent<{
     options: {

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

@@ -1,4 +1,4 @@
-import { AnyObject } from '..\..\..\..\../es/src/types';
+import { AnyObject } from '../../../../../es/src/types';
 import { FormRequestType } from '../types';
 import { PropType } from 'vue';
 declare type UrlConfig = {

package/es/packages/form-render/src/components/slider.js

@@ -1,6 +1,6 @@
 import { connect, mapProps } from '@formily/vue';
 import { NSlider } from 'naive-ui';
-import { assignUpdateValue } from '..\\..\\..\\../packages/form-render/src/utils';
+import { assignUpdateValue } from '../../../../packages/form-render/src/utils';
 
 const SLIDER = connect(NSlider, mapProps((props, field) => {
   const _props = assignUpdateValue(props, field);

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

@@ -1,4 +1,4 @@
-import { ContextCollector } from '..\..\..\..\../es/packages/form-render/src/hooks/useChangeContext';
+import { ContextCollector } from '../../../../../es/packages/form-render/src/hooks/useChangeContext';
 import { BusinessCollector, FormItemDepsCollector } from '../hooks';
 import { FormAsyncQueue } from '../types';
 import { Component, InjectionKey } from 'vue';

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

@@ -9,3 +9,4 @@ export * from './useFormValidator';
 export * from './useBusinessBinding';
 export * from './useChangeContext';
 export * from './useFormItemDeps';
+export * from './useInitialData';

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

@@ -9,3 +9,4 @@ export { useFormValidator } from './useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './useFormItemDeps.js';
+export { useInitialData } from './useInitialData.js';

package/es/packages/form-render/src/hooks/useAsyncQueue.js

@@ -120,7 +120,7 @@ function useAsyncQueue() {
           const res = await http[method](url, params);
           const { data, success } = res;
           if (!success)
-            throw new Error(`Request error => ${res}`);
+            throw res;
           cb(void 0, data);
         } catch (e) {
           cb(new Error(`Request error => ${e}`));

package/es/packages/form-render/src/hooks/useChangeContext.d.ts

@@ -1,4 +1,4 @@
-import { FormChangeContext } from '..\..\..\..\../es/packages/form-render';
+import { FormChangeContext } from '../../../../../es/packages/form-render';
 export declare class ContextCollector {
     private readonly contextMap;
     setContext(key: string, prop: keyof FormChangeContext, value: any): void;

package/es/packages/form-render/src/hooks/useFieldList2Schema.js

@@ -157,7 +157,7 @@ function useFieldList2Schema(collector) {
   const createWidgetCombinationSchema = (item) => {
     const suffixList = arrayed(item.suffixConfig);
     const fieldList = [{ ...item, suffixConfig: void 0 }].concat(suffixList.map((suffix) => {
-      return { ...suffix, is_show: "1", hide_title: "1" };
+      return { ...suffix, is_show: item.is_show, alias: " " };
     }));
     return {
       type: "void",

package/es/packages/form-render/src/hooks/useFormField.js

@@ -6,9 +6,7 @@ function useFormField() {
   return {
     field,
     title: computed(() => field.value.title),
-    fieldKey: computed(() => {
-      return field.value.props.name.toString();
-    })
+    fieldKey: computed(() => field.value.props.name.toString())
   };
 }
 

package/es/packages/form-render/src/hooks/useFormItemDeps.js

@@ -1,4 +1,4 @@
-import { arrayed } from '..\\..\\..\\../packages/form-render/src/utils';
+import { arrayed } from '../../../../packages/form-render/src/utils';
 
 class FormItemDepsCollector {
   constructor() {

package/es/packages/form-render/src/hooks/useFormValidator.d.ts

@@ -1,4 +1,4 @@
-import { AnyObject } from '..\..\..\..\../es/src/types';
+import { AnyObject } from '../../../../../es/src/types';
 import { FieldItem } from '../types';
 export declare function useFormValidator(): {
     createValidatorSchema: (fieldItem: FieldItem) => AnyObject[];

package/es/packages/form-render/src/hooks/useInitialData.d.ts

@@ -0,0 +1,5 @@
+import { AnyObject } from '../../../../../es/src/types';
+import { FieldItem } from '../../../../../es/packages/form-render';
+export declare function useInitialData(): {
+    assignInitialData: (initialData?: AnyObject, fieldList?: FieldItem[]) => AnyObject;
+};

package/es/packages/form-render/src/hooks/useInitialData.js

@@ -0,0 +1,11 @@
+function useInitialData() {
+  function assignInitialData(initialData, fieldList) {
+    return Object.assign({}, initialData, fieldList == null ? void 0 : fieldList.reduce((fin, cur) => {
+      cur.default_val && (fin[cur.val_key] = cur.default_val);
+      return fin;
+    }, {}));
+  }
+  return { assignInitialData };
+}
+
+export { useInitialData };

package/es/packages/form-render/src/types/fieldItem.d.ts

@@ -1,4 +1,4 @@
-import { AnyObject } from '..\..\..\..\../es/src/types';
+import { AnyObject } from '../../../../../es/src/types';
 export declare type ValidateItem = Partial<{
     obj_type: string;
     vali_obj: string;

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

@@ -1,4 +1,4 @@
-import { AnyObject } from '..\..\..\..\../es/src/types';
+import { AnyObject } from '../../../../../es/src/types';
 import { DataField, Field } from '@formily/core';
 import { FieldItem } from '../types';
 import { AsyncQueue } from '../hooks';
@@ -20,7 +20,7 @@ export interface FormAsyncQueueItem {
 export declare type FormAsyncQueue = AsyncQueue<FormAsyncQueueItem, any, AnyObject[]>;
 export declare type IdCardParseInfo = Record<'sex' | 'birthday', string> & Record<'age' | 'day' | 'month' | 'year', number>;
 export declare type FormRenderExpose = {
-    validate(): Promise<unknown>;
+    validate(): Promise<void>;
     getFormValues(): AnyObject;
     setFieldState(path: string, setter: (field: Field) => void): void;
 };

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

@@ -1,4 +1,4 @@
-import { AnyObject } from '..\..\..\..\../es/src/types';
+import { AnyObject } from '../../../../../es/src/types';
 import { GeneralField } from '@formily/core';
 import { InjectionKey } from 'vue';
 import { IdCardParseInfo } from '../types';

package/es/packages/form-render/style/index.css

@@ -30,7 +30,7 @@
 .form-render__inputGroup {
   grid-column: span var(--column) / span var(--column);
   display: flex;
-  align-items: flex-end;
+  align-items: flex-start;
 }
 .form-render__inputGroup > div {
   flex: 1;