cnhis-design-vue 3.1.8-beta.6 → 3.1.8-beta.9

package/es/packages/big-table/src/BigTable.vue.d.ts

@@ -1391,7 +1391,22 @@ declare const _default: import("vue").DefineComponent<{
         maxWidth: NumberConstructor;
     }, {
         popoverRef: import("vue").Ref<{
-            syncPosition: () => void;
+            syncPosition: () => void; /**
+             * 针对 bigTable 的设置列
+             * type: 列的类型
+             * field: 列字段名（注：属性层级越深，渲染性能将直线下降）
+             * title: 列标题（支持开启国际化）
+             * width: 列宽度（如果为空则均匀分配剩余宽度，如果全部列固定了，可能会存在宽屏下不会铺满，可以配合 "%" 或者 "min-width" 布局）
+             * minWidth: 最小列宽度；会自动将剩余空间按比例分配
+             * resizable: 列是否允许拖动列宽调整大小
+             * visible: 列是否显示
+             * fixed: 将列固定在左侧或者右侧（注意：固定列应该放在左右两侧的位置）
+             * align: 列对齐方式
+             * headerAlign: 表头列的对齐方式
+             * footerAlign: 表尾列的对齐方式
+             * formatter: 格式化显示内容 Function({cellValue, row, column})
+             * sortable: 是否允许列排序
+             */
             setShow: (value: boolean) => void;
         } | null>;
         mergedTheme: import("vue").ComputedRef<{

package/es/packages/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.mjs

@@ -288,9 +288,10 @@ var script = /* @__PURE__ */ defineComponent({
       if (state.isTree != 3)
         return;
       let table = xGrid.value;
-      let key = (_a = table.getTableColumn().tableColumn) == null ? void 0 : _a.find((column) => {
+      let obj = (_a = table.getTableColumn().tableColumn) == null ? void 0 : _a.find((column) => {
         return !!column.property;
-      }).property;
+      });
+      let key = (obj == null ? void 0 : obj.property) || "";
       setTreeGroupTitle(formatList, key, GROUP_TITLE_KEY);
     };
     const setCurrentPageRowChecked = () => {
@@ -1680,7 +1681,7 @@ var script = /* @__PURE__ */ defineComponent({
       }, [createVNode("div", {
         "style": {
           background: color,
-          height: "100%"
+          height: "24px"
         }
       }, null)])];
     };

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

@@ -1,6 +1,6 @@
 import { AnyObject } from 'cnhis-design-vue/es/src/types';
-import { FieldItem, FieldVisitor } from "./types";
-import { Component, FunctionalComponent, PropType } from "vue";
+import { FieldItem, FieldVisitor } from './types';
+import { Component, FunctionalComponent, PropType } from 'vue';
 declare const _default: import("vue").DefineComponent<{
     fieldList: {
         type: PropType<FieldItem[]>;
@@ -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,9 +24,12 @@ var script = /* @__PURE__ */ defineComponent({
       type: Object,
       default: () => ({})
     },
-    scope: { type: Object, default: () => ({}) }
+    scope: { type: Object, default: () => ({}) },
+    consumer: { type: Boolean, default: false }
   },
-  emits: ["formChange"],
+  emits: [
+    "formChange"
+  ],
   setup(__props, { expose, emit }) {
     const props = __props;
     const { create, trigger } = useBusinessBinding();
@@ -79,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/constants/index.d.ts

@@ -1,6 +1,6 @@
-import { BusinessCollector } from "../hooks";
-import { FormAsyncQueue } from "../types";
-import { Component, InjectionKey } from "vue";
+import { BusinessCollector } from '../hooks';
+import { FormAsyncQueue } from '../types';
+import { Component, InjectionKey } from 'vue';
 export declare const InjectAsyncQueue: InjectionKey<FormAsyncQueue>;
 export declare const InjectionSchemaField: InjectionKey<Component>;
 export declare const InjectionBusinessCollector: InjectionKey<BusinessCollector>;
@@ -11,6 +11,8 @@ export declare enum FIELD_BUSINESS_TYPE {
     MOBILE = "mobile",
     TELEPHONE = "telephone",
     EMAIL = "email",
+    SEX = "sex",
+    BIRTHDAY = "birthday",
     BANK_CARD = "bank_card",
     WEBSITE = "website",
     GESTATIONAL_WEEKS = "gestational_weeks",

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

@@ -8,6 +8,8 @@ var FIELD_BUSINESS_TYPE = /* @__PURE__ */ ((FIELD_BUSINESS_TYPE2) => {
   FIELD_BUSINESS_TYPE2["MOBILE"] = "mobile";
   FIELD_BUSINESS_TYPE2["TELEPHONE"] = "telephone";
   FIELD_BUSINESS_TYPE2["EMAIL"] = "email";
+  FIELD_BUSINESS_TYPE2["SEX"] = "sex";
+  FIELD_BUSINESS_TYPE2["BIRTHDAY"] = "birthday";
   FIELD_BUSINESS_TYPE2["BANK_CARD"] = "bank_card";
   FIELD_BUSINESS_TYPE2["WEBSITE"] = "website";
   FIELD_BUSINESS_TYPE2["GESTATIONAL_WEEKS"] = "gestational_weeks";

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

@@ -1,5 +1,5 @@
-import { Form } from "@formily/core";
-import { FIELD_BUSINESS_TYPE } from "../constants";
+import { Form } from '@formily/core';
+import { FIELD_BUSINESS_TYPE } from '../constants';
 export declare class BusinessCollector {
     typeCollector: Map<FIELD_BUSINESS_TYPE, Set<string>>;
     fieldNameCollector: Map<string, FIELD_BUSINESS_TYPE>;

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

@@ -34,6 +34,18 @@ function useBusinessBinding() {
         state.value = info.age;
       });
     });
+    const sexFields = collector.getField(FIELD_BUSINESS_TYPE.SEX);
+    sexFields.forEach((field) => {
+      formModel.setFieldState(field, (state) => {
+        state.value = info.sex;
+      });
+    });
+    const birthdayFields = collector.getField(FIELD_BUSINESS_TYPE.BIRTHDAY);
+    birthdayFields.forEach((field) => {
+      formModel.setFieldState(field, (state) => {
+        state.value = info.birthday;
+      });
+    });
   }
   const handlerMap = /* @__PURE__ */ new Map([[FIELD_BUSINESS_TYPE.ID_CARD, handlerIdCardType]]);
   function trigger(collector, formModel, fieldName, value) {

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/info-header/src/InfoHeader.vue_vue_type_script_setup_true_lang.mjs

@@ -1,4 +1,4 @@
-import { defineComponent, ref, nextTick, onMounted, watch, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot, Fragment, toDisplayString, createCommentVNode, renderList, withDirectives, createBlock, unref, withCtx, createTextVNode, vShow, createVNode } from 'vue';
+import { defineComponent, ref, nextTick, onMounted, watch, openBlock, createElementBlock, normalizeClass, normalizeStyle, createElementVNode, renderSlot, createCommentVNode, Fragment, toDisplayString, renderList, withDirectives, createBlock, unref, withCtx, createTextVNode, vShow, createVNode } from 'vue';
 import { NTag, NDescriptions, NDescriptionsItem, NEllipsis } from 'naive-ui';
 import { useThrottleFn, useEventListener } from '@vueuse/core';
 import SlotRender from './SlotRender.mjs';
@@ -6,7 +6,10 @@ import './HiddenContent.mjs';
 import script$1 from './HiddenContent.vue_vue_type_script_setup_true_lang.mjs';
 
 const _hoisted_1 = { class: "c-info-header__operation" };
-const _hoisted_2 = /* @__PURE__ */ createElementVNode("div", { class: "c-info-header__divider" }, null, -1);
+const _hoisted_2 = {
+  key: 0,
+  class: "c-info-header__divider"
+};
 const _hoisted_3 = { class: "c-info-header__patient" };
 const _hoisted_4 = { class: "c-info-header__patientHeader" };
 const _hoisted_5 = {
@@ -37,7 +40,11 @@ var script = /* @__PURE__ */ defineComponent({
     minColumnWidth: { type: [String, Number], default: 240 },
     rowHeight: { type: [String, Number], default: 32 }
   },
-  emits: ["openPatientInfo", "fieldSet", "update:compact"],
+  emits: [
+    "openPatientInfo",
+    "fieldSet",
+    "update:compact"
+  ],
   setup(__props, { expose, emit }) {
     const props = __props;
     function toggleCompact() {
@@ -99,7 +106,7 @@ var script = /* @__PURE__ */ defineComponent({
         createElementVNode("section", _hoisted_1, [
           renderSlot(_ctx.$slots, "operation")
         ]),
-        _hoisted_2,
+        _ctx.$slots.operation ? (openBlock(), createElementBlock("div", _hoisted_2)) : createCommentVNode("v-if", true),
         createElementVNode("section", _hoisted_3, [
           renderSlot(_ctx.$slots, "patientModule"),
           !_ctx.$slots.avatarModule ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [

package/package.json

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