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

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

@@ -87,6 +87,10 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         type: import("vue").PropType<import("cnhis-design-vue/es/src/types").AnyObject>;
         default: () => {};
     };
+    consumer: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         fieldList: {
@@ -174,6 +178,10 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
             type: import("vue").PropType<import("cnhis-design-vue/es/src/types").AnyObject>;
             default: () => {};
         };
+        consumer: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
     }>>;
@@ -304,6 +312,7 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     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<{}>>, {}>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fieldList: {
         type: import("vue").PropType<import("./src/types").FieldItem[]>;
@@ -390,6 +399,10 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
         type: import("vue").PropType<import("cnhis-design-vue/es/src/types").AnyObject>;
         default: () => {};
     };
+    consumer: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     onFormChange?: ((...args: any[]) => any) | undefined;
 }, {
@@ -398,5 +411,6 @@ declare const FormRender: SFCWithInstall<import("vue").DefineComponent<{
     initialData: import("cnhis-design-vue/es/src/types").AnyObject;
     parallelism: number;
     scope: import("cnhis-design-vue/es/src/types").AnyObject;
+    consumer: boolean;
 }>>;
 export default FormRender;

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

@@ -87,6 +87,10 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<AnyObject>;
         default: () => {};
     };
+    consumer: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         fieldList: {
@@ -174,6 +178,10 @@ declare const _default: import("vue").DefineComponent<{
             type: PropType<AnyObject>;
             default: () => {};
         };
+        consumer: {
+            type: BooleanConstructor;
+            default: boolean;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
     }>>;
@@ -304,6 +312,7 @@ declare const _default: import("vue").DefineComponent<{
     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<{}>>, {}>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, "formChange"[], "formChange", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     fieldList: {
         type: PropType<FieldItem[]>;
@@ -390,6 +399,10 @@ declare const _default: import("vue").DefineComponent<{
         type: PropType<AnyObject>;
         default: () => {};
     };
+    consumer: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
 }>> & {
     onFormChange?: ((...args: any[]) => any) | undefined;
 }, {
@@ -398,5 +411,6 @@ declare const _default: import("vue").DefineComponent<{
     initialData: AnyObject;
     parallelism: number;
     scope: AnyObject;
+    consumer: boolean;
 }>;
 export default _default;

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

@@ -1,15 +1,16 @@
-import { defineComponent, computed, openBlock, createElementBlock, normalizeStyle, createVNode, unref, withCtx, renderSlot } from 'vue';
+import { defineComponent, computed, openBlock, createElementBlock, normalizeStyle, createVNode, unref, withCtx, renderSlot, createBlock, createElementVNode, toDisplayString, createCommentVNode } from 'vue';
 import { injectOrProvide } from './utils/index.mjs';
 import { cloneDeep } from 'lodash-es';
 import { InjectionBusinessCollector, InjectAsyncQueue, InjectionSchemaField } from './constants/index.mjs';
 import * as index from './components/index.mjs';
 import { createForm, onFieldValueChange } from '@formily/core';
-import { FormProvider, createSchemaField } from '@formily/vue';
+import { FormProvider, FormConsumer, createSchemaField } from '@formily/vue';
 import { useBusinessBinding } from './hooks/useBusinessBinding.mjs';
 import { useAsyncQueue } from './hooks/useAsyncQueue.mjs';
 import { useFieldVisitor } from './hooks/useFieldVisitor.mjs';
 import { useFieldList2Schema } from './hooks/useFieldList2Schema.mjs';
 
+const _hoisted_1 = { style: { "white-space": "pre" } };
 var script = /* @__PURE__ */ defineComponent({
   __name: "FormRender",
   props: {
@@ -23,7 +24,8 @@ var script = /* @__PURE__ */ defineComponent({
       type: Object,
       default: () => ({})
     },
-    scope: { type: Object, default: () => ({}) }
+    scope: { type: Object, default: () => ({}) },
+    consumer: { type: Boolean, default: false }
   },
   emits: [
     "formChange"
@@ -81,7 +83,13 @@ var script = /* @__PURE__ */ defineComponent({
           default: withCtx(() => [
             renderSlot(_ctx.$slots, "default", { schemaFiled: unref(SchemaField) }, () => [
               createVNode(unref(SchemaField), { schema: unref(renderSchema) }, null, 8, ["schema"])
-            ])
+            ]),
+            __props.consumer ? (openBlock(), createBlock(unref(FormConsumer), { key: 0 }, {
+              default: withCtx(({ form }) => [
+                createElementVNode("div", _hoisted_1, toDisplayString(JSON.stringify(form.values, null, 2)), 1)
+              ]),
+              _: 1
+            })) : createCommentVNode("v-if", true)
           ]),
           _: 3
         }, 8, ["form"])

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

@@ -0,0 +1,13 @@
+export declare const COMPLEX: import("vue").DefineComponent<{
+    span: {
+        type: NumberConstructor;
+        default: number;
+    };
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    span: {
+        type: NumberConstructor;
+        default: number;
+    };
+}>>, {
+    span: number;
+}>;

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

@@ -0,0 +1,31 @@
+import { defineComponent, createVNode } from 'vue';
+import { connect, mapProps } from '@formily/vue';
+import { assignUpdateValue } from 'cnhis-design-vue/es/packages/form-render/src/utils';
+
+const script = defineComponent({
+  props: {
+    span: {
+      type: Number,
+      default: 6
+    }
+  },
+  setup(props, {
+    slots,
+    attrs
+  }) {
+    function onChange(e) {
+      e.stopPropagation();
+    }
+    return () => {
+      return createVNode("section", {
+        "class": "form-render__complex"
+      }, [createVNode("section", {
+        "class": "form-render__complexContent",
+        "onChange": onChange
+      }, [slots.default && slots.default()])]);
+    };
+  }
+});
+const COMPLEX = connect(script, mapProps(assignUpdateValue));
+
+export { COMPLEX };

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

@@ -13,3 +13,4 @@ export * from './switch';
 export * from './radio';
 export * from './labelSelect';
 export * from './slider';
+export * from './complex';

package/es/packages/form-render/src/components/index.mjs

@@ -13,3 +13,4 @@ export { SWITCH } from './switch.mjs';
 export { RADIO } from './radio.mjs';
 export { LABEL } from './labelSelect.mjs';
 export { SLIDER } from './slider.mjs';
+export { COMPLEX } from './complex.mjs';

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

@@ -109,6 +109,7 @@ function useFieldList2Schema(collector) {
   };
   const createCustomSchema = (item) => {
     const schema = createStandardSchema(item);
+    item.fieldType && (schema.type = item.fieldType);
     Object.assign(schema["x-component-props"], {
       fieldItem: item
     });
@@ -126,6 +127,13 @@ function useFieldList2Schema(collector) {
       }
     };
   };
+  const createComplexSchema = (item) => {
+    const schema = createStandardSchema(item);
+    const properties = Array.isArray(item.properties) ? transform(item.properties) : {};
+    schema.type = item.fieldType || "void";
+    schema.properties = properties;
+    return schema;
+  };
   const creatorMap = /* @__PURE__ */ new Map([
     ["LINEBAR", createCollapseSchema],
     ["INPUT", createInputSchema],
@@ -137,7 +145,8 @@ function useFieldList2Schema(collector) {
     ["RADIO", createRadioSchema],
     ["CHECKBOX", createRadioSchema],
     ["SWITCH", createSwitchSchema],
-    ["SLIDER", createSliderSchema]
+    ["SLIDER", createSliderSchema],
+    ["COMPLEX", createComplexSchema]
   ]);
   const createWidgetSchema = (item) => {
     if (item.suffixConfig)

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

@@ -40,6 +40,8 @@ export declare type FieldItem = {
     wordbook?: AnyObject;
     suFieldList?: any[];
     bindEventSetting?: Ievent[];
+    fieldType: 'string' | 'object' | 'array' | 'number' | 'void' | 'boolean' | 'datetime';
+    properties: FieldItem[];
     [key: string]: any;
 }>;
 export {};

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

@@ -82,3 +82,11 @@
 .form-render__combinationContent {
   position: relative;
 }
+.form-render__complex {
+  width: 100%;
+}
+.form-render__complexContent {
+  display: grid !important;
+  grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
+  gap: 0 8px;
+}

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

@@ -118,4 +118,12 @@
       position: relative;
     }
   }
+
+  &__complex {
+    width: 100%;
+
+    &Content {
+      @display();
+    }
+  }
 }

package/es/packages/index.css

@@ -2672,3 +2672,11 @@ body > .vxe-table--tooltip-wrapper {
 .form-render__combinationContent {
   position: relative;
 }
+.form-render__complex {
+  width: 100%;
+}
+.form-render__complexContent {
+  display: grid !important;
+  grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
+  gap: 0 8px;
+}

package/es/packages/index.less

@@ -3062,5 +3062,13 @@ body {
       position: relative;
     }
   }
+
+  &__complex {
+    width: 100%;
+
+    &Content {
+      @display();
+    }
+  }
 }
 

package/es/packages/select-person/src/SelectPerson.vue.d.ts

@@ -313,7 +313,7 @@ declare const _default: import("vue").DefineComponent<{
             colorPressedPrimary: string;
             colorFocusPrimary: string;
             colorDisabledPrimary: string;
-            textColorPrimary: string;
+            textColorPrimary: string; /** 提交映射 */
             textColorHoverPrimary: string;
             textColorPressedPrimary: string;
             textColorFocusPrimary: string;
@@ -2146,9 +2146,7 @@ declare const _default: import("vue").DefineComponent<{
             '--n-clear-color-hover': string;
             '--n-clear-color-pressed': string;
             '--n-icon-color': string;
-            '--n-icon-color-hover': string; /**
-             * 拼接key
-             */
+            '--n-icon-color-hover': string;
             '--n-icon-color-pressed': string;
             '--n-icon-color-disabled': string;
             '--n-suffix-text-color': string;

package/es/packages/select-person/src/SelectPerson.vue_vue_type_script_setup_true_lang.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, ref, reactive, computed, nextTick, watch, onMounted, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, createCommentVNode, createTextVNode, toDisplayString, createBlock, withDirectives, vShow, mergeProps, renderSlot, Fragment, renderList, normalizeClass } from 'vue';
+import { defineComponent, ref, reactive, computed, nextTick, watch, onMounted, openBlock, createElementBlock, createVNode, unref, withCtx, createElementVNode, createCommentVNode, withKeys, createTextVNode, toDisplayString, createBlock, withDirectives, vShow, mergeProps, renderSlot, Fragment, renderList, normalizeClass } from 'vue';
 import { useMessage, NSpin, NInputGroup, NInput, NButton, NCheckbox, NTree, NIcon, NTooltip } from 'naive-ui';
 import { CloseCircleSharp } from '@vicons/ionicons5';
 import vexutils from 'cnhis-design-vue/es/src/utils/vexutils';
@@ -517,6 +517,8 @@ var script = /* @__PURE__ */ defineComponent({
         callback: (child) => {
         }
       }) || [];
+      state.dataList.main = [];
+      generateDataList(state.treeData.main, state.dataList.main);
     };
     const onExpand = (expandedKeys) => {
       state.expandedKeys = expandedKeys;
@@ -797,8 +799,9 @@ var script = /* @__PURE__ */ defineComponent({
             clearable: "",
             value: state.title,
             "onUpdate:value": _cache[0] || (_cache[0] = ($event) => state.title = $event),
-            placeholder: __props.searchPlaceholder
-          }, null, 8, ["value", "placeholder"]), createVNode(unref(NButton), {
+            placeholder: __props.searchPlaceholder,
+            onKeyup: withKeys(searchClick, ["enter", "native"])
+          }, null, 8, ["value", "placeholder", "onKeyup"]), createVNode(unref(NButton), {
             type: "primary",
             onClick: searchClick
           }, {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.8-beta.8",
+  "version": "3.1.9",
   "license": "ISC",
   "module": "es/packages/index.mjs",
   "main": "es/packages/index.mjs",