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

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

@@ -14,6 +14,7 @@ export declare type ValidateItem = Partial<{
 interface OptionItem {
     text: string;
     value: string;
+    children?: OptionItem[];
 }
 export interface Ievent {
     event_field: string;
@@ -39,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,71 @@
-export { arrayed, assignUpdateValue, formRenderLog, injectOrProvide, isIdCard, parseIdCard, transformDateFormat } from './index2.mjs';
+import { FIELD_SEX_VALUE } from '../constants/index.mjs';
+import { isField } from '@formily/core';
+import differenceInDays from '../../../../node_modules/date-fns/esm/differenceInDays/index.mjs';
+import differenceInMonths from '../../../../node_modules/date-fns/esm/differenceInMonths/index.mjs';
+import { inject, provide } from 'vue';
+
+function formRenderLog(message, type = "log") {
+  console[type](`[FormRender]: ${message}`);
+}
+function arrayed(maybeArray) {
+  if (Array.isArray(maybeArray))
+    return maybeArray;
+  return [maybeArray];
+}
+function assignUpdateValue(props, field) {
+  const _props = { ...props };
+  if (isField(field)) {
+    Object.assign(_props, {
+      "onUpdate:value"(value) {
+        field.setValue(value);
+      }
+    });
+  }
+  return _props;
+}
+function transformDateFormat(format) {
+  return format.includes("HH") ? "datetime" : "date";
+}
+function isIdCard(idCardNo) {
+  return /^\d{6}(((19|20)\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|3[0-1])\d{3}(\d|x|X))|(\d{2}(0[1-9]|1[0-2])(0[1-9]|[1-2]\d|3[0-1])\d{3}))$/.test(idCardNo);
+}
+function parseIdCard(idCardNo) {
+  const parseInner = (certificateNo, idxSexStart, birthYearSpan) => {
+    const res = {};
+    const idxSex = 1 - certificateNo.substr(idxSexStart, 1) % 2;
+    res.sex = idxSex === 1 ? FIELD_SEX_VALUE.FEMALE : FIELD_SEX_VALUE.MALE;
+    const year = (birthYearSpan == 2 ? "19" : "") + certificateNo.substr(6, birthYearSpan);
+    const month = certificateNo.substr(6 + birthYearSpan, 2);
+    const day = certificateNo.substr(8 + birthYearSpan, 2);
+    res.birthday = year + "-" + month + "-" + day;
+    const d = new Date();
+    const monthFloor = d.getMonth() + 1 < parseInt(month, 10) || d.getMonth() + 1 == parseInt(month, 10) && d.getDate() < parseInt(day, 10) ? 1 : 0;
+    res.age = res.year = d.getFullYear() - parseInt(year, 10) - monthFloor;
+    res.day = differenceInDays(d, new Date(res.birthday));
+    res.month = differenceInMonths(d, new Date(res.birthday));
+    return res;
+  };
+  return parseInner(idCardNo, idCardNo.length == 15 ? 14 : 16, idCardNo.length == 15 ? 2 : 4);
+}
+function injectOrProvide(key, creator) {
+  let injected = inject(key, null);
+  if (!injected) {
+    injected = creator();
+    provide(key, injected);
+  }
+  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, generateUrlParams, injectOrProvide, isIdCard, parseIdCard, transformDateFormat };

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

@@ -1,18 +1,18 @@
-.formily-render__wrapper {
+.form-render__wrapper {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
   gap: 0 8px;
 }
-.formily-render__formItem {
+.form-render__formItem {
   grid-column: span var(--form-item-column) / span var(--form-item-column);
 }
-.formily-render__formItem .n-date-picker {
+.form-render__formItem .n-date-picker {
   width: 100%;
 }
-.formily-render__collapse {
+.form-render__collapse {
   grid-column: span var(--column) / span var(--column);
 }
-.formily-render__collapseHeader {
+.form-render__collapseHeader {
   cursor: pointer;
   display: flex;
   background: #fafafa;
@@ -22,44 +22,48 @@
   margin-bottom: 8px;
   border: 1px solid #d9d9d9;
 }
-.formily-render__collapseItem {
+.form-render__collapseItem {
   display: grid !important;
   grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
   gap: 0 8px;
 }
-.formily-render__inputGroup {
+.form-render__inputGroup {
   grid-column: span var(--column) / span var(--column);
   display: flex;
   align-items: flex-end;
 }
-.formily-render__inputGroup > div {
+.form-render__inputGroup > div {
   flex: 1;
 }
-.formily-render__inputGroup > div:not(:last-of-type) .n-input__border,
-.formily-render__inputGroup > div:not(:last-of-type) .n-base-selection__border {
+.form-render__inputGroup > div:not(:last-of-type) .n-input__border,
+.form-render__inputGroup > div:not(:last-of-type) .n-base-selection__border {
   border-right: 0;
   border-bottom-right-radius: 0;
   border-top-right-radius: 0;
 }
-.formily-render__inputGroup > div:last-of-type .n-input__border,
-.formily-render__inputGroup > div:last-of-type .n-base-selection__border {
+.form-render__inputGroup > div:last-of-type .n-input__border,
+.form-render__inputGroup > div:last-of-type .n-base-selection__border {
   border-bottom-left-radius: 0;
   border-top-left-radius: 0;
 }
-.formily-render__combination {
+.form-render__combination {
   width: 100%;
 }
-.formily-render__combinationHeader {
+.form-render__combinationHeader {
   display: flex;
   gap: 12px;
 }
-.formily-render__combinationHeader > h3 {
+.form-render__combinationHeader > h3 {
   font-size: 16px;
   font-weight: 700;
   padding: 0;
   margin: 0;
 }
-.formily-render__combinationClose {
+.form-render__combinationHeaderText {
+  font-size: 16px;
+  font-weight: 500;
+}
+.form-render__combinationClose {
   position: absolute;
   right: 0;
   top: 5px;
@@ -75,6 +79,14 @@
   vertical-align: middle;
   font-size: 16px;
 }
-.formily-render__combinationContent {
+.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

@@ -1,116 +1,129 @@
-@block: ~"formily-render";
-
-#formily-grid() {
-  .display(@column) {
-    display: grid !important;
-    grid-template-columns: repeat(@column, minmax(0px, 1fr));
-    gap: 0 8px;
-  }
-  .item(@column) {
-    grid-column: span @column / span @column;
-  }
-}
-
-#formily-input-group(@direction) {
-  border-bottom-@{direction}-radius: 0;
-  border-top-@{direction}-radius: 0;
-}
-
-.@{block} {
-  @display: #formily-grid .display(var(--column));
-  @item: #formily-grid .item(var(--column));
-  @form-item: #formily-grid .item(var(--form-item-column));
-
-  &__wrapper {
-    @display();
-  }
-
-  &__formItem {
-    @form-item();
-
-    .n-date-picker {
-      width: 100%;
-    }
-  }
-
-  &__collapse {
-    @item();
-
-    &Header {
-      cursor: pointer;
-      display: flex;
-      background: #fafafa;
-      height: 36px;
-      align-items: center;
-      padding: 0 16px;
-      margin-bottom: 8px;
-      border: 1px solid #d9d9d9;
-    }
-
-    &Item {
-      @display();
-    }
-  }
-
-  &__inputGroup {
-    @item();
-    display: flex;
-    align-items: flex-end;
-
-    > div {
-      flex: 1;
-
-      &:not(:last-of-type) {
-        .n-input__border,
-        .n-base-selection__border {
-          border-right: 0;
-          #formily-input-group(right);
-        }
-      }
-
-      &:last-of-type {
-        .n-input__border,
-        .n-base-selection__border {
-          #formily-input-group(left);
-        }
-      }
-    }
-  }
-
-  &__combination {
-    width: 100%;
-
-    &Header {
-      > h3 {
-        font-size: 16px;
-        font-weight: 700;
-        padding: 0;
-        margin: 0;
-      }
-
-      display: flex;
-      gap: 12px;
-    }
-
-    &Close {
-      position: absolute;
-      right: 0;
-      top: 5px;
-      width: 14px;
-      height: 14px;
-      border-radius: 50%;
-      background: red;
-      cursor: pointer;
-      display: inline-flex;
-      align-items: center;
-      justify-content: center;
-      color: white;
-      vertical-align: middle;
-      font-size: 16px;
-    }
-
-    &Content {
-      position: relative;
-    }
-  }
-}
+@block: ~"form-render";
+
+#form-grid() {
+  .display(@column) {
+    display: grid !important;
+    grid-template-columns: repeat(@column, minmax(0px, 1fr));
+    gap: 0 8px;
+  }
+  .item(@column) {
+    grid-column: span @column / span @column;
+  }
+}
+
+#form-input-group(@direction) {
+  border-bottom-@{direction}-radius: 0;
+  border-top-@{direction}-radius: 0;
+}
+
+.@{block} {
+  @display: #form-grid .display(var(--column));
+  @item: #form-grid .item(var(--column));
+  @form-item: #form-grid .item(var(--form-item-column));
+
+  &__wrapper {
+    @display();
+  }
+
+  &__formItem {
+    @form-item();
+
+    .n-date-picker {
+      width: 100%;
+    }
+  }
+
+  &__collapse {
+    @item();
+
+    &Header {
+      cursor: pointer;
+      display: flex;
+      background: #fafafa;
+      height: 36px;
+      align-items: center;
+      padding: 0 16px;
+      margin-bottom: 8px;
+      border: 1px solid #d9d9d9;
+    }
+
+    &Item {
+      @display();
+    }
+  }
+
+  &__inputGroup {
+    @item();
+    display: flex;
+    align-items: flex-end;
+
+    > div {
+      flex: 1;
+
+      &:not(:last-of-type) {
+        .n-input__border,
+        .n-base-selection__border {
+          border-right: 0;
+          #form-input-group(right);
+        }
+      }
+
+      &:last-of-type {
+        .n-input__border,
+        .n-base-selection__border {
+          #form-input-group(left);
+        }
+      }
+    }
+  }
+
+  &__combination {
+    width: 100%;
+
+    &Header {
+      > h3 {
+        font-size: 16px;
+        font-weight: 700;
+        padding: 0;
+        margin: 0;
+      }
+
+      display: flex;
+      gap: 12px;
+    }
+
+    &HeaderText {
+      font-size: 16px;
+      font-weight: 500;
+    }
+
+    &Close {
+      position: absolute;
+      right: 0;
+      top: 5px;
+      width: 14px;
+      height: 14px;
+      border-radius: 50%;
+      background: red;
+      cursor: pointer;
+      display: inline-flex;
+      align-items: center;
+      justify-content: center;
+      color: white;
+      vertical-align: middle;
+      font-size: 16px;
+    }
+
+    &Content {
+      position: relative;
+    }
+  }
+
+  &__complex {
+    width: 100%;
+
+    &Content {
+      @display();
+    }
+  }
+}