cnhis-design-vue 3.1.16-beta.8 → 3.1.17-beta.0

package/es/packages/form-render/src/utils/schema.js

@@ -14,7 +14,7 @@ function fieldKeyEscape(fieldList) {
   return fieldList.map((f) => f.val_key).join("-").replace(/[.]/g, "_");
 }
 function elementIdEscape(id) {
-  return id.replace(".", "-");
+  return id.replace(/[.]/g, "-");
 }
 function createLinebarId(id) {
   return elementIdEscape(`id-${id}`);
@@ -90,5 +90,8 @@ function traverseFieldList(fieldList, handler) {
   }
   traverse(fieldList);
 }
+function createObjSchema(properties) {
+  return { type: "object", properties };
+}
 
-export { assignUpdateValue, createLinebarId, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema };
+export { assignUpdateValue, createLinebarId, createObjSchema, elementIdEscape, fieldKeyEscape, getParentLinebar, traverseDependKey, traverseFieldList, traverseSchema };

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

@@ -105,6 +105,10 @@
   padding: 0;
   margin: 0;
 }
+.form-render__combinationHeader .n-button__icon {
+  font-size: 14px;
+  margin: 0 2px 0 0;
+}
 .form-render__combinationHeaderText {
   font-size: 16px;
   font-weight: 500;
@@ -115,18 +119,17 @@
   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;
 }
+.form-render__combinationContentJson {
+  position: relative;
+}
 .form-render__combinationContent {
   position: relative;
+  display: grid !important;
+  grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
+  align-items: start;
+  gap: 0 16px;
 }
 .form-render__complex {
   width: 100%;

package/es/packages/index.css

@@ -2926,6 +2926,10 @@ body > .vxe-table--tooltip-wrapper {
   padding: 0;
   margin: 0;
 }
+.form-render__combinationHeader .n-button__icon {
+  font-size: 14px;
+  margin: 0 2px 0 0;
+}
 .form-render__combinationHeaderText {
   font-size: 16px;
   font-weight: 500;
@@ -2936,18 +2940,17 @@ body > .vxe-table--tooltip-wrapper {
   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;
 }
+.form-render__combinationContentJson {
+  position: relative;
+}
 .form-render__combinationContent {
   position: relative;
+  display: grid !important;
+  grid-template-columns: repeat(var(--column), minmax(0px, 1fr));
+  align-items: start;
+  gap: 0 16px;
 }
 .form-render__complex {
   width: 100%;
@@ -3184,6 +3187,7 @@ body > .vxe-table--tooltip-wrapper {
 .form-config__material {
   padding: 16px;
   box-sizing: border-box;
+  flex-shrink: 0;
   width: 200px;
   background: white;
 }
@@ -3194,8 +3198,12 @@ body > .vxe-table--tooltip-wrapper {
   height: 40px;
 }
 .form-config__materialContent {
-  padding: 8px;
-  min-height: 400px;
+  padding: 16px;
+  box-sizing: border-box;
+  flex-shrink: 0;
+  overflow-y: auto;
+  max-height: var(--max-height);
+  min-height: 200px;
   display: flex;
   flex-direction: column;
   gap: 8px;
@@ -3212,6 +3220,8 @@ body > .vxe-table--tooltip-wrapper {
 .form-config__displayWrapper {
   padding: 16px;
   box-sizing: border-box;
+  flex-shrink: 0;
+  min-width: 400px;
   flex: 1;
   padding: 16px 0;
 }
@@ -3224,6 +3234,9 @@ body > .vxe-table--tooltip-wrapper {
 .form-config__displayContent {
   padding: 16px;
   box-sizing: border-box;
+  flex-shrink: 0;
+  overflow-y: auto;
+  max-height: var(--max-height);
   height: fit-content;
   background: #eeeeee;
   display: grid !important;
@@ -3237,9 +3250,23 @@ body > .vxe-table--tooltip-wrapper {
 .form-config__config {
   padding: 16px;
   box-sizing: border-box;
-  width: 220px;
+  flex-shrink: 0;
+  width: 240px;
   background: white;
 }
+.form-config__configHeader {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 40px;
+}
+.form-config__configContent {
+  padding: 16px;
+  box-sizing: border-box;
+  flex-shrink: 0;
+  overflow-y: auto;
+  max-height: var(--max-height);
+}
 .form-config__renderer--default {
   display: flex;
   align-items: center;

package/es/packages/index.js

@@ -51,7 +51,6 @@ export { useFormValidator } from './form-render/src/hooks/useFormValidator.js';
 export { BusinessCollector, useBusinessBinding } from './form-render/src/hooks/useBusinessBinding.js';
 export { ContextCollector, useChangeContext } from './form-render/src/hooks/useChangeContext.js';
 export { FormItemDepsCollector, useFormItemDeps } from './form-render/src/hooks/useFormItemDeps.js';
-export { useInitialData } from './form-render/src/hooks/useInitialData.js';
 export { useAnchor } from './form-render/src/hooks/useAnchor.js';
 export { useFormContext } from './form-render/src/hooks/useFormContext.js';
 export { GlobalShortcutProvider, ShortcutManager, useShortcuts } from './shortcut-provider/src/hooks/useShortcuts.js';

package/es/packages/shortcut-provider/src/hooks/useShortcuts.js

@@ -88,6 +88,7 @@ class ShortcutManager {
       const callback = this.shortcutCallbackMap.get(keySignature);
       if (!callback)
         return;
+      event.preventDefault();
       const shortcutItem = Object.values(this.shortcutCache.value).find((item) => item.currentKeySignature === keySignature);
       if (!shortcutItem || shortcutItem.status !== ShortcutStatus.ACTIVE || shortcutItem.disabled)
         return;

package/es/packages/shortcut-setter/index.d.ts

@@ -122,6 +122,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         content?: string | import("..").FormRenderer | Record<string, import("..").FormRenderer> | undefined;
         lazyRequest?: boolean | undefined;
         maxGroupNum?: number | undefined;
+        jsonCombination?: boolean | undefined;
         children?: any[] | undefined;
         properties?: any[] | undefined;
         componentProps?: import("../../../es/src/types").AnyObject | undefined;
@@ -1807,7 +1808,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
             }>>;
         };
@@ -1922,7 +1923,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
                 }>>;
             };
@@ -1931,7 +1932,9 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<any>;
+        formModel: import("@formily/core").Form<{
+            [x: string]: any;
+        }>;
         SchemaField: import("vue").Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("..").BusinessCollector;
         formItemDepsCollector: import("..").FormItemDepsCollector;
@@ -3422,7 +3425,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").UndefinedAble<import("../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../es/src/types").AnyObject[];
             }>>;
         };

package/es/packages/shortcut-setter/src/ShortcutSetter.vue.d.ts

@@ -124,6 +124,7 @@ declare const _default: import("vue").DefineComponent<{
         content?: string | import("../../../../es/packages/form-render").FormRenderer | Record<string, import("../../../../es/packages/form-render").FormRenderer> | undefined;
         lazyRequest?: boolean | undefined;
         maxGroupNum?: number | undefined;
+        jsonCombination?: boolean | undefined;
         children?: any[] | undefined;
         properties?: any[] | undefined;
         componentProps?: import("../../../../es/src/types").AnyObject | undefined;
@@ -1809,7 +1810,7 @@ declare const _default: import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
             }>>;
         };
@@ -1924,7 +1925,7 @@ declare const _default: import("vue").DefineComponent<{
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                    beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                     afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
                 }>>;
             };
@@ -1933,7 +1934,9 @@ declare const _default: import("vue").DefineComponent<{
         }>>;
         emit: (event: "formChange", ...args: any[]) => void;
         nuiThemeOverrides: import("naive-ui").GlobalThemeOverrides;
-        formModel: import("@formily/core").Form<any>;
+        formModel: import("@formily/core").Form<{
+            [x: string]: any;
+        }>;
         SchemaField: Component<any, any, any, import("vue").ComputedOptions, import("vue").MethodOptions>;
         businessCollector: import("../../../../es/packages/form-render").BusinessCollector;
         formItemDepsCollector: import("../../../../es/packages/form-render").FormItemDepsCollector;
@@ -3424,7 +3427,7 @@ declare const _default: import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").WithUndefined<import("../../../../es/src/types").AnyObject>;
+                beforeRequest(fieldKey: string, params?: import("../../../../es/src/types").AnyObject | undefined): void | import("../../../../es/src/types").UndefinedAble<import("../../../../es/src/types").AnyObject>;
                 afterRequest(fieldKey: string, payload?: any): import("../../../../es/src/types").AnyObject[];
             }>>;
         };

package/es/src/types/index.d.ts

@@ -4,7 +4,7 @@ export declare type SFCWithInstall<T> = T & {
 };
 export declare type AnyObject = Record<string, any>;
 export declare type Func<T extends Array<any> = any[], P = any> = (...args: T) => P;
-export declare type WithNull<T> = T | null;
-export declare type WithUndefined<T> = T | undefined;
+export declare type Nullable<T> = T | null | undefined;
+export declare type UndefinedAble<T> = T | undefined;
 export declare type ArrayAble<T> = T | T[];
 export declare type MapValue<T> = T extends Map<any, infer P> ? P : any;

package/es/src/utils/index.d.ts

@@ -1,2 +1,3 @@
 import { App, Component } from 'vue';
 export declare function safeComponentRegister(app: App, component: Component, cName?: string | undefined, scheduler?: () => void): void;
+export declare function generateTimeFormat(format: string): string | undefined;

package/es/src/utils/index.js

@@ -1,3 +1,5 @@
+import { isString } from 'lodash-es';
+
 function safeComponentRegister(app, component, cName = component.name, scheduler) {
   if (!cName)
     throw new Error(`[CUI]: invalid component name for ${component}`);
@@ -11,5 +13,13 @@ function safeComponentRegister(app, component, cName = component.name, scheduler
     app.component(cName, component);
   }
 }
+function generateTimeFormat(format) {
+  if (!isString(format))
+    return;
+  const matched = format.match(/[Hms:]+/);
+  if (!matched)
+    return;
+  return matched[0];
+}
 
-export { safeComponentRegister };
+export { generateTimeFormat, safeComponentRegister };

package/global.d.ts

@@ -1,8 +1,8 @@
-import * as NaiveUI from 'naive-ui';
-
-declare module 'naive-ui' {
-  // @ts-ignore
-  export const NTree: any;
-}
-
-export {};
+import * as NaiveUI from 'naive-ui';
+
+declare module 'naive-ui' {
+  // @ts-ignore
+  export const NTree: any;
+}
+
+export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.16-beta.8",
+  "version": "3.1.17-beta.0",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",
@@ -31,9 +31,9 @@
     "vue": "^3.2.0"
   },
   "dependencies": {
-    "@formily/core": "^2.1.9",
-    "@formily/path": "^2.1.9",
-    "@formily/vue": "^2.1.9",
+    "@formily/core": "2.1.9",
+    "@formily/path": "2.1.9",
+    "@formily/vue": "2.1.9",
     "@highlightjs/vue-plugin": "^2.1.0",
     "@vicons/ionicons5": "^0.12.0",
     "@vueuse/core": "^8.6.0",

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

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

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

@@ -1,16 +0,0 @@
-import { Path } from '@formily/path';
-import { mergeWith } from 'lodash-es';
-import { traverseFieldList } from '../../../../packages/form-render/src/utils';
-
-function useInitialData() {
-  function assignInitialData(initialData, fieldList) {
-    const defaultVal = {};
-    fieldList && traverseFieldList(fieldList, (field) => {
-      field.default_val != void 0 && Path.setIn(defaultVal, field.val_key, field.default_val);
-    });
-    return mergeWith({}, initialData, defaultVal);
-  }
-  return { assignInitialData };
-}
-
-export { useInitialData };