cnhis-design-vue 3.1.5-beta.12 → 3.1.5-beta.13

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

@@ -36,7 +36,7 @@ function useFormValidator() {
       });
     }
     if (max_length) {
-      rules.push({ len: max_length, message });
+      rules.push({ max: max_length, message });
     }
     const ruleCreator = vali_obj && validateMap.get(vali_obj);
     ruleCreator && rules.push(Object.assign({}, commonValidateConfig, ruleCreator(fieldItem)));

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/src/types/index.d.ts

@@ -1,8 +1,8 @@
 import { AnyObject } from 'cnhis-design-vue/es/src/types';
-import { Field } from "@formily/core";
-import { FieldItem } from "../types";
-import { AsyncQueue } from "../hooks";
-export * from "./fieldItem";
+import { DataField, Field } from '@formily/core';
+import { FieldItem } from '../types';
+import { AsyncQueue } from '../hooks';
+export * from './fieldItem';
 export interface FieldVisitorContext {
     field: FieldItem;
     replace(f: FieldItem): void;
@@ -10,7 +10,7 @@ export interface FieldVisitorContext {
     insertAfter(f: FieldItem | FieldItem[]): void;
 }
 export declare type FieldVisitor = Record<string, (context: FieldVisitorContext) => void>;
-export declare type FormRequestType = "post" | "get" | "patch" | "delete" | "put";
+export declare type FormRequestType = 'post' | 'get' | 'patch' | 'delete' | 'put';
 export interface FormAsyncQueueItem {
     key: any;
     url: string;
@@ -18,9 +18,19 @@ export interface FormAsyncQueueItem {
     params?: AnyObject;
 }
 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 IdCardParseInfo = Record<'sex' | 'birthday', string> & Record<'age' | 'day' | 'month' | 'year', number>;
 export declare type FormRenderExpose = {
     validate(): Promise<unknown>;
     getFormValues(): AnyObject;
     setFieldState(path: string, setter: (field: Field) => void): void;
 };
+export declare type FormChangeContext = Partial<{
+    currentOption: AnyObject;
+}>;
+export declare type FormChangePayload = {
+    value: any;
+    fieldKey: string;
+    fieldName: string;
+    fieldInstance: DataField;
+    context: FormChangeContext;
+};

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

@@ -1,6 +1,7 @@
-import { GeneralField } from "@formily/core";
-import { InjectionKey } from "vue";
-import { IdCardParseInfo } from "../types";
+import { AnyObject } from 'cnhis-design-vue/es/src/types';
+import { GeneralField } from '@formily/core';
+import { InjectionKey } from 'vue';
+import { IdCardParseInfo } from '../types';
 export declare function formRenderLog(message: string, type?: keyof Console): void;
 export declare function arrayed<T>(maybeArray: T): T extends Array<any> ? T : [T];
 export declare function assignUpdateValue(props: any, field: GeneralField): any;
@@ -8,3 +9,4 @@ export declare function transformDateFormat(format: string): "date" | "datetime"
 export declare function isIdCard(idCardNo: string): boolean;
 export declare function parseIdCard(idCardNo: string): IdCardParseInfo;
 export declare function injectOrProvide<T>(key: InjectionKey<T>, creator: () => T): T;
+export declare function generateUrlParams(field: GeneralField, dependKeys?: string | string[]): AnyObject;

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

@@ -1 +1 @@
-export { arrayed, assignUpdateValue, formRenderLog, injectOrProvide, isIdCard, parseIdCard, transformDateFormat } from './index2.mjs';
+export { arrayed, assignUpdateValue, formRenderLog, generateUrlParams, injectOrProvide, isIdCard, parseIdCard, transformDateFormat } from './index2.mjs';

package/es/packages/form-render/src/utils/index2.mjs

@@ -55,5 +55,17 @@ function injectOrProvide(key, creator) {
   }
   return injected;
 }
+function generateUrlParams(field, dependKeys) {
+  const result = {};
+  if (dependKeys) {
+    arrayed(dependKeys).forEach((dependKey) => {
+      const _field = field.query(dependKey).take();
+      if (isField(_field)) {
+        result[dependKey] = _field.value;
+      }
+    });
+  }
+  return result;
+}
 
-export { arrayed, assignUpdateValue, formRenderLog, injectOrProvide, isIdCard, parseIdCard, transformDateFormat };
+export { arrayed, assignUpdateValue, formRenderLog, generateUrlParams, injectOrProvide, isIdCard, parseIdCard, transformDateFormat };

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

@@ -1499,6 +1499,10 @@ body > .vxe-table--tooltip-wrapper {
   flex-wrap: wrap;
   width: 100%;
 }
+.c-choice-wrap .n-radio-input {
+  width: 14px;
+  height: 14px;
+}
 .c-choice-wrap .scale-choice-img-wrap {
   display: inline-block;
   position: relative;
@@ -1566,18 +1570,18 @@ body > .vxe-table--tooltip-wrapper {
   align-items: center;
   margin: 4px 0;
 }
-.c-choice-wrap label :deep(.n-radio__label) {
+.c-choice-wrap label .n-radio__label {
   flex: 1;
   display: inline-flex;
   align-items: center;
   white-space: normal;
 }
-.c-choice-wrap > :deep(.n-checkbox) {
+.c-choice-wrap > .n-checkbox {
   display: inline-flex;
   align-items: center;
   margin: 4px 0;
 }
-.c-choice-wrap > :deep(.n-checkbox) .n-checkbox__label {
+.c-choice-wrap > .n-checkbox .n-checkbox__label {
   flex: 1;
   display: inline-flex;
   align-items: center;
@@ -1609,7 +1613,7 @@ body > .vxe-table--tooltip-wrapper {
   box-sizing: border-box;
   color: rgba(0, 0, 0, 0.65);
 }
-.c-scale :deep(.n-form-item-label) {
+.c-scale .n-form-item-label {
   font-weight: 700;
 }
 .c-scale .scale-container {
@@ -1638,7 +1642,7 @@ body > .vxe-table--tooltip-wrapper {
   border-radius: 10px;
   background-color: #dbdcdc;
 }
-.c-scale :deep(.no-data-tip) {
+.c-scale .no-data-tip {
   width: 100%;
   height: 100%;
 }
@@ -1709,10 +1713,10 @@ body > .vxe-table--tooltip-wrapper {
 .rich-text-content {
   word-break: break-all;
 }
-.rich-text-content :deep(p) {
+.rich-text-content p {
   margin-bottom: 0;
 }
-.rich-text-content :deep(img) {
+.rich-text-content img {
   max-width: 100%;
 }
 .n-dialog.n-modal.c-evatip-dialog-wrap {
@@ -2009,6 +2013,9 @@ body > .vxe-table--tooltip-wrapper {
   width: 100%;
   text-align: left;
 }
+.c-scale .n-form-item {
+  --n-label-height: unset !important;
+}
 .no-data-tip {
   display: flex;
   flex-direction: column;
@@ -2095,13 +2102,13 @@ body > .vxe-table--tooltip-wrapper {
   width: 100%;
   cursor: pointer;
 }
-.c-map-container :deep(.n-input.map-input) .n-input__prefix {
+.c-map-container .n-input.map-input .n-input__prefix {
   transform: rotate(180deg);
 }
-.c-map-container :deep(.n-input.map-input) .n-input__prefix .n-icon {
+.c-map-container .n-input.map-input .n-input__prefix .n-icon {
   color: rgba(0, 0, 0, 0.65);
 }
-.c-map-container :deep(.n-input.map-input).n-input--disabled .n-input__input-el {
+.c-map-container .n-input.map-input.n-input--disabled .n-input__input-el {
   color: rgba(0, 0, 0, 0.65);
   background-color: #fff;
   cursor: pointer;
@@ -2112,33 +2119,33 @@ body > .vxe-table--tooltip-wrapper {
 .c-scale-upload {
   width: 100%;
 }
-.c-scale-upload :deep(.n-upload-file-list) {
+.c-scale-upload .n-upload-file-list {
   display: flex;
 }
-.c-scale-upload :deep(.n-upload-file-list) .n-upload-file .n-upload-file-info .n-upload-file-info__action.n-upload-file-info__action--image-card-type {
+.c-scale-upload .n-upload-file-list .n-upload-file .n-upload-file-info .n-upload-file-info__action.n-upload-file-info__action--image-card-type {
   box-sizing: border-box;
   background: rgba(0, 0, 0, 0.5);
 }
-.c-scale-upload :deep(.n-upload-file-list) .n-upload-file .n-upload-file-info .n-upload-file-info__action.n-upload-file-info__action--image-card-type span.n-button__icon {
+.c-scale-upload .n-upload-file-list .n-upload-file .n-upload-file-info .n-upload-file-info__action.n-upload-file-info__action--image-card-type span.n-button__icon {
   color: #fff;
 }
-.c-scale-upload :deep(.n-upload-file-list) .n-upload-trigger.n-upload-trigger--image-card {
+.c-scale-upload .n-upload-file-list .n-upload-trigger.n-upload-trigger--image-card {
   width: 184px;
   height: 184px;
   border-color: #d5d5d5;
   background-color: #fafafa;
 }
-.c-scale-upload :deep(.n-upload-file-list) .n-upload-file.n-upload-file--image-card-type {
+.c-scale-upload .n-upload-file-list .n-upload-file.n-upload-file--image-card-type {
   width: 184px;
   height: 184px;
   padding: 8px;
   border-color: #d5d5d5;
   background-color: #fafafa;
 }
-.c-scale-upload :deep(.n-upload-file-list) .n-upload-file.n-upload-file--image-card-type .n-image {
+.c-scale-upload .n-upload-file-list .n-upload-file.n-upload-file--image-card-type .n-image {
   height: 100%;
 }
-.c-scale-upload :deep(.n-upload-file-list) .n-upload-file.n-upload-file--image-card-type img {
+.c-scale-upload .n-upload-file-list .n-upload-file.n-upload-file--image-card-type img {
   object-fit: cover !important;
 }
 .c-scale-upload .upload-img-wrap {
@@ -2160,15 +2167,15 @@ body > .vxe-table--tooltip-wrapper {
 .c-scale-upload.scale-upload-file .dragger-upload-text {
   color: rgba(0, 0, 0, 0.65);
 }
-.c-scale-upload.scale-upload-file :deep(.n-upload-file-list) {
+.c-scale-upload.scale-upload-file .n-upload-file-list {
   display: flex;
   flex-direction: column;
   width: 100%;
 }
-.c-scale-upload.scale-upload-file :deep(.n-upload-file-list) .n-upload-file {
+.c-scale-upload.scale-upload-file .n-upload-file-list .n-upload-file {
   width: 100%;
 }
-.c-scale-upload.scale-upload-file :deep(.n-upload-trigger) {
+.c-scale-upload.scale-upload-file .n-upload-trigger {
   width: 100%;
   background: #fafafa;
   border-color: #d5d5d5;
@@ -2549,9 +2556,6 @@ body > .vxe-table--tooltip-wrapper {
   vertical-align: middle !important;
   max-width: calc(var(--column-width) * 1px);
 }
-.c-info-header__info .n-descriptions-table-content__content {
-  font-weight: 700;
-}
 .c-info-header__info .n-descriptions-table-content__label {
   display: inline-block;
 }
@@ -2672,3 +2676,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.d.ts

@@ -14,10 +14,10 @@ import CInfoHeader from './info-header';
 import CTimeLine from './time-line';
 import CBpmnWorkflow from './bpmn-workflow';
 import Editor from './editor';
-import FormRender from './form-render';
+import CFormRender from './form-render';
 export * from './form-render';
 declare function install(app: App): void;
-export { CGrid, CBigTable, CFieldSet, CDragLayout, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CFormTable, CInfoHeader, CTimeLine, CBpmnWorkflow, Editor, FormRender };
+export { CGrid, CBigTable, CFieldSet, CDragLayout, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CFormTable, CInfoHeader, CTimeLine, CBpmnWorkflow, Editor, CFormRender };
 declare const _default: {
     install: typeof install;
 };

package/es/packages/index.less

@@ -1735,6 +1735,10 @@ body {
   display: flex;
   flex-wrap: wrap;
   width: 100%;
+  .n-radio-input {
+    width: 14px;
+    height: 14px;
+  }
   .scale-choice-img-wrap {
     display: inline-block;
     position: relative;
@@ -1807,14 +1811,14 @@ body {
     display: inline-flex;
     align-items: center;
     margin: 4px 0;
-    :deep(.n-radio__label) {
+    .n-radio__label {
       flex: 1;
       display: inline-flex;
       align-items: center;
       white-space: normal;
     }
   }
-  > :deep(.n-checkbox) {
+  > .n-checkbox {
     display: inline-flex;
     align-items: center;
     margin: 4px 0;
@@ -1851,7 +1855,7 @@ body {
   padding-bottom: 50px;
   box-sizing: border-box;
   color: rgba(0, 0, 0, 0.65);
-  :deep(.n-form-item-label) {
+  .n-form-item-label {
     font-weight: 700;
   }
   .scale-container {
@@ -1882,7 +1886,7 @@ body {
       background-color: #dbdcdc;
     }
   }
-  :deep(.no-data-tip) {
+  .no-data-tip {
     width: 100%;
     height: 100%;
   }
@@ -1954,10 +1958,10 @@ body {
 }
 .rich-text-content {
   word-break: break-all;
-  :deep(p) {
+  p {
     margin-bottom: 0;
   }
-  :deep(img) {
+  img {
     max-width: 100%;
   }
 }
@@ -2269,6 +2273,9 @@ body {
     width: 100%;
     text-align: left;
   }
+  .n-form-item {
+    --n-label-height: unset !important;
+  }
 }
 
 .no-data-tip {
@@ -2360,7 +2367,7 @@ body {
 .c-map-container {
   width: 100%;
   cursor: pointer;
-  :deep(.n-input.map-input) {
+  .n-input.map-input {
     .n-input__prefix {
       transform: rotate(180deg);
       .n-icon {
@@ -2381,7 +2388,7 @@ body {
 
 .c-scale-upload {
   width: 100%;
-  :deep(.n-upload-file-list) {
+  .n-upload-file-list {
     display: flex;
     .n-upload-file .n-upload-file-info .n-upload-file-info__action.n-upload-file-info__action--image-card-type {
       box-sizing: border-box;
@@ -2432,7 +2439,7 @@ body {
     .dragger-upload-text {
       color: rgba(0, 0, 0, 0.65)
     }
-    :deep(.n-upload-file-list) {
+    .n-upload-file-list {
       display: flex;
       flex-direction: column;
       width: 100%;
@@ -2441,7 +2448,7 @@ body {
       }
 
     }
-    :deep(.n-upload-trigger)  {
+    .n-upload-trigger {
       width: 100%;
       background: #fafafa;
       border-color: #d5d5d5;
@@ -2890,10 +2897,6 @@ body {
       max-width: calc(var(--column-width) * 1px);
     }
 
-    .n-descriptions-table-content__content {
-      font-weight: 700;
-    }
-
     .n-descriptions-table-content__label {
       display: inline-block;
     }
@@ -3062,5 +3065,13 @@ body {
       position: relative;
     }
   }
+
+  &__complex {
+    width: 100%;
+
+    &Content {
+      @display();
+    }
+  }
 }
 

package/es/packages/index.mjs

@@ -13,7 +13,7 @@ export { default as CInfoHeader } from './info-header/index2.mjs';
 export { default as CTimeLine } from './time-line/index2.mjs';
 export { default as CBpmnWorkflow } from './bpmn-workflow/index2.mjs';
 export { default as Editor } from './editor/index2.mjs';
-export { default as FormRender } from './form-render/index2.mjs';
+export { default as CFormRender } from './form-render/index2.mjs';
 export { useFieldList2Schema } from './form-render/src/hooks/useFieldList2Schema2.mjs';
 export { useFormRequest } from './form-render/src/hooks/useFormRequest2.mjs';
 export { useCommonLog } from './form-render/src/hooks/useCommonLog2.mjs';
@@ -23,4 +23,6 @@ export { useFieldVisitor } from './form-render/src/hooks/useFieldVisitor2.mjs';
 export { useTypeNormalize } from './form-render/src/hooks/useTypeNormalize2.mjs';
 export { useFormValidator } from './form-render/src/hooks/useFormValidator2.mjs';
 export { BusinessCollector, useBusinessBinding } from './form-render/src/hooks/useBusinessBinding2.mjs';
+export { ContextCollector, useChangeContext } from './form-render/src/hooks/useChangeContext2.mjs';
+export { FormItemDepsCollector, useFormItemDeps } from './form-render/src/hooks/useFormItemDeps2.mjs';
 export { CCheckbox, CDatetime, CRadio, CScaleView, CSelect } from './scale-view/index2.mjs';

package/es/packages/index2.mjs

@@ -29,7 +29,7 @@ export { default as CBpmnWorkflow } from './bpmn-workflow/index2.mjs';
 import Editor from './editor/index2.mjs';
 export { default as Editor } from './editor/index2.mjs';
 import FormRender from './form-render/index2.mjs';
-export { default as FormRender } from './form-render/index2.mjs';
+export { default as CFormRender } from './form-render/index2.mjs';
 
 const components = {
   CGrid: Grid,
@@ -52,7 +52,7 @@ const components = {
   CTimeLine: TimeLine,
   CBpmnWorkflow: BpmnWorkflow,
   Editor,
-  FormRender
+  CFormRender: FormRender
 };
 function install(app) {
   Object.values(components).forEach((component) => {

package/es/packages/info-header/index.d.ts

@@ -10,12 +10,13 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
     };
     patientInfo: {
         type: import("vue").PropType<Partial<{
-            name: String;
-            sex: String;
-            age: String;
+            name: string;
+            sex: string;
+            age: string;
+            ageUnit?: string | undefined;
             tagList?: Partial<{
                 type: "info" | "warning";
-                content: String;
+                content: string;
             }>[] | undefined;
         }>>;
         default: () => {};
@@ -52,12 +53,13 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
         };
         patientInfo: {
             type: import("vue").PropType<Partial<{
-                name: String;
-                sex: String;
-                age: String;
+                name: string;
+                sex: string;
+                age: string;
+                ageUnit?: string | undefined;
                 tagList?: Partial<{
                     type: "info" | "warning";
-                    content: String;
+                    content: string;
                 }>[] | undefined;
             }>>;
             default: () => {};
@@ -95,7 +97,8 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
         color: string;
         textColor: string;
     };
-    getEllipsisStyle: (index: number) => import("vue").CSSProperties;
+    getDescriptionItemStyle: ({ bold, contentStyle }?: import("cnhis-design-vue/es/src/types").AnyObject) => import("vue").CSSProperties;
+    getEllipsisStyle: (index: number, { bold, contentStyle }?: import("cnhis-design-vue/es/src/types").AnyObject) => import("vue").CSSProperties;
     needHidden: (item: import("cnhis-design-vue/es/src/types").AnyObject) => boolean;
     infoRef: import("vue").Ref<HTMLElement | undefined>;
     columnNum: import("vue").Ref<number>;
@@ -1428,6 +1431,10 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
         width: {
             type: NumberConstructor;
         };
+        contentStyle: {
+            type: import("vue").PropType<import("vue").CSSProperties>;
+            default: () => {};
+        };
     }, {
         props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
             content: {
@@ -1437,6 +1444,10 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
             width: {
                 type: NumberConstructor;
             };
+            contentStyle: {
+                type: import("vue").PropType<import("vue").CSSProperties>;
+                default: () => {};
+            };
         }>> & {
             [x: `on${string}`]: ((...args: any[]) => any) | ((...args: unknown[]) => any) | undefined;
         }>>;
@@ -1446,7 +1457,9 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
             maxWidth: string;
             width: string;
         }>;
-        maxWidth: import("vue").ComputedRef<string>;
+        parsedContentStyle: import("vue").ComputedRef<"" | (import("vue").CSSProperties & {
+            maxWidth: string;
+        })>;
         displayContent: import("vue").ComputedRef<string>;
         NEllipsis: import("vue").DefineComponent<{
             readonly expandTrigger: import("vue").PropType<"click">;
@@ -1779,7 +1792,12 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
         width: {
             type: NumberConstructor;
         };
+        contentStyle: {
+            type: import("vue").PropType<import("vue").CSSProperties>;
+            default: () => {};
+        };
     }>>, {
+        contentStyle: import("vue").CSSProperties;
         content: string;
     }>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("openPatientInfo" | "fieldSet" | "update:compact")[], "openPatientInfo" | "fieldSet" | "update:compact", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
@@ -1793,12 +1811,13 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
     };
     patientInfo: {
         type: import("vue").PropType<Partial<{
-            name: String;
-            sex: String;
-            age: String;
+            name: string;
+            sex: string;
+            age: string;
+            ageUnit?: string | undefined;
             tagList?: Partial<{
                 type: "info" | "warning";
-                content: String;
+                content: string;
             }>[] | undefined;
         }>>;
         default: () => {};
@@ -1832,12 +1851,13 @@ declare const InfoHeader: SFCWithInstall<import("vue").DefineComponent<{
     labelField: string;
     valueField: string;
     patientInfo: Partial<{
-        name: String;
-        sex: String;
-        age: String;
+        name: string;
+        sex: string;
+        age: string;
+        ageUnit?: string | undefined;
         tagList?: Partial<{
             type: "info" | "warning";
-            content: String;
+            content: string;
         }>[] | undefined;
     }>;
     minColumnWidth: string | number;