cnhis-design-vue 3.1.15-beta.5 → 3.1.15-beta.8

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

@@ -3,11 +3,11 @@ import { FormRenderLifeCycle, FormRenderProps } from '../../../../../es/packages
 export declare function useFormRenderLifeCycle(props: FormRenderProps): {
     callLifeCycle: <T extends "onSetup" | "beforeRequest" | "afterRequest">(lifeCycleName: T, payload?: Parameters<Required<Partial<{
         onSetup(): void;
-        beforeRequest(params?: import("../../../../../es/src/types").AnyObject | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject>;
-        afterRequest(payload?: import("../../../../../es/src/types").AnyObject[] | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject[]>;
+        beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject>;
+        afterRequest(fieldKey: string, payload?: import("../../../../../es/src/types").AnyObject[] | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject[]>;
     }>>[T]> | undefined) => WithUndefined<ReturnType<Required<Partial<{
         onSetup(): void;
-        beforeRequest(params?: import("../../../../../es/src/types").AnyObject | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject>;
-        afterRequest(payload?: import("../../../../../es/src/types").AnyObject[] | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject[]>;
+        beforeRequest(fieldKey: string, params?: import("../../../../../es/src/types").AnyObject | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject>;
+        afterRequest(fieldKey: string, payload?: import("../../../../../es/src/types").AnyObject[] | undefined): void | WithUndefined<import("../../../../../es/src/types").AnyObject[]>;
     }>>[T]>>;
 };

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

@@ -54,8 +54,8 @@ export declare type FormBusinessFilter = (payload: {
 export declare type DependKeyType = ArrayAble<string> | Record<string, string> | ArrayAble<Record<'paramName' | 'paramValue', string>>;
 export declare type FormRenderLifeCycle = Partial<{
     onSetup(): void;
-    beforeRequest(params?: AnyObject): WithUndefined<AnyObject> | void;
-    afterRequest(payload?: AnyObject[]): WithUndefined<AnyObject[]> | void;
+    beforeRequest(fieldKey: string, params?: AnyObject): WithUndefined<AnyObject> | void;
+    afterRequest(fieldKey: string, payload?: AnyObject[]): WithUndefined<AnyObject[]> | void;
 }>;
 export declare type FormRenderProps = Partial<{
     fieldList: FieldItem[];

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

@@ -8,7 +8,7 @@ export declare function arrayed<T>(maybeArray: T): T extends Array<any> ? T : [T
 export declare function assignUpdateValue(props: AnyObject, field: GeneralField): {
     [x: string]: any;
 };
-export declare function transformDateFormat(format?: string): "date" | "datetime";
+export declare function transformDateFormat(format?: string): "date" | "datetime" | "month";
 export declare function isIdCard(idCardNo: string): boolean;
 export declare function isMobile(mobile: string): boolean;
 export declare function parseBirthday(birthday: string): AgeContext;

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

@@ -26,7 +26,12 @@ function assignUpdateValue(props, field) {
   }
   return _props;
 }
+function isMonthType(format) {
+  return format && format.replace(/yyyy-MM/gi, "YYYY-MM") === "YYYY-MM";
+}
 function transformDateFormat(format = "") {
+  if (isMonthType(format))
+    return "month";
   return format.includes("HH") ? "datetime" : "date";
 }
 function isIdCard(idCardNo) {

package/es/packages/index.css

@@ -2711,7 +2711,7 @@ body > .vxe-table--tooltip-wrapper {
 @font-face {
   font-family: 'iconfont';
   /* Project id 3468756 */
-  src: url('./iconfont.ttf?t=1655348824139') format('truetype');
+  src: url('./iconfont.ttf') format('truetype');
 }
 .c-info-header .iconfont {
   font-family: 'iconfont' !important;
@@ -3178,3 +3178,111 @@ body > .vxe-table--tooltip-wrapper {
 .nodeTipContent li p {
   margin: 0;
 }
+.form-config {
+  display: flex;
+  justify-content: space-between;
+}
+.form-config__material {
+  padding: 16px;
+  box-sizing: border-box;
+  width: 200px;
+  min-height: 400px;
+  background: white;
+}
+.form-config__materialHeader {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 40px;
+}
+.form-config__materialContent {
+  padding: 8px;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+}
+.form-config__materialContentItem {
+  display: flex;
+  align-items: center;
+  padding: 8px;
+  border: 1px dashed #d9d9d9;
+  box-sizing: border-box;
+  background-color: #fafafa;
+  grid-column: span var(--item-column) / span var(--item-column);
+}
+.form-config__displayWrapper {
+  padding: 16px;
+  box-sizing: border-box;
+  flex: 1;
+  padding: 16px 0;
+}
+.form-config__displayHeader {
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  height: 40px;
+}
+.form-config__displayContent {
+  padding: 16px;
+  box-sizing: border-box;
+  height: fit-content;
+  background: #eeeeee;
+  display: grid !important;
+  grid-template-columns: repeat(12, minmax(0px, 1fr));
+  gap: 8px 16px;
+}
+.form-config__displayContentItem {
+  grid-column: span var(--item-column) / span var(--item-column);
+  position: relative;
+}
+.form-config__config {
+  padding: 16px;
+  box-sizing: border-box;
+  width: 220px;
+  background: white;
+}
+.form-config__renderer--default {
+  display: flex;
+  align-items: center;
+  padding: 8px;
+  border: 1px dashed #d9d9d9;
+  box-sizing: border-box;
+  background-color: #fafafa;
+  user-select: none;
+  position: relative;
+  width: 100%;
+}
+.form-config__renderer--complex {
+  border: 1px dashed lightblue;
+  padding: 8px;
+}
+.form-config__renderer--complex--grid {
+  display: grid !important;
+  grid-template-columns: repeat(12, minmax(0px, 1fr));
+  gap: 8px 16px;
+  grid-column: span var(--item-column) / span var(--item-column);
+}
+.form-config__renderer--complex--flex {
+  display: flex;
+}
+.form-config .is-disabled {
+  background: #e5e5e5;
+}
+.form-config .is-required {
+  padding-left: 16px !important;
+}
+.form-config .is-required::before {
+  position: absolute;
+  content: '*';
+  left: 8px;
+  color: red;
+}
+.form-config .is-active {
+  color: #5585f5;
+}
+.form-config .is-choosing {
+  box-shadow: #5585f5 0 0 0 2px !important;
+}
+.form-config .is-choosing-area {
+  background: #f0f7ff;
+}

package/es/packages/index.d.ts

@@ -19,12 +19,14 @@ import CFormRender from './form-render';
 import CFabricChart from './fabric-chart';
 import CShortcutProvider from './shortcut-provider';
 import CShortcutSetter from './shortcut-setter';
+import CFormConfig from './form-config';
 export * from './form-render';
 export * from './shortcut-provider';
 export * from './big-table';
 export * from './button-print';
+export * from './form-config';
 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, CStepsWheel, Editor, CFormRender, CFabricChart, CShortcutProvider, CShortcutSetter };
+export { CGrid, CBigTable, CFieldSet, CDragLayout, CButtonPrint, CSelectPerson, CSelectLabel, CLabelFormContent, CScaleView, CMap, CVodChunkUpload, CRadio, CCheckbox, CSelect, CDatetime, CFormTable, CInfoHeader, CTimeLine, CBpmnWorkflow, CStepsWheel, Editor, CFormRender, CFabricChart, CShortcutProvider, CShortcutSetter, CFormConfig };
 declare const _default: {
     install: typeof install;
 };

package/es/packages/index.js

@@ -38,6 +38,8 @@ import ShortcutProvider from './shortcut-provider/index.js';
 export { default as CShortcutProvider } from './shortcut-provider/index.js';
 import ShortcutSetter from './shortcut-setter/index.js';
 export { default as CShortcutSetter } from './shortcut-setter/index.js';
+import FormConfig from './form-config/index.js';
+export { default as CFormConfig } from './form-config/index.js';
 export { useFieldListAdaptor } from './form-render/src/hooks/useFieldListAdaptor.js';
 export { useFormRequest } from './form-render/src/hooks/useFormRequest.js';
 export { useCommonLog } from './form-render/src/hooks/useCommonLog.js';
@@ -82,7 +84,8 @@ const components = {
   CFormRender: FormRender,
   CFabricChart: FabricChart,
   CShortcutProvider: ShortcutProvider,
-  CShortcutSetter: ShortcutSetter
+  CShortcutSetter: ShortcutSetter,
+  CFormConfig: FormConfig
 };
 function install(app) {
   Object.values(components).forEach((component) => {

package/es/packages/info-header/style/index.css

@@ -10,7 +10,7 @@
 @font-face {
   font-family: 'iconfont';
   /* Project id 3468756 */
-  src: url('./iconfont.ttf?t=1655348824139') format('truetype');
+  src: url('./iconfont.ttf') format('truetype');
 }
 .c-info-header .iconfont {
   font-family: 'iconfont' !important;

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

@@ -57,7 +57,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
                 fieldItem: import("..").FieldItem;
                 placeholder: string;
                 editPlaceholder: string;
-                operation: ("disabled" | "reset")[];
+                operation: ("reset" | "state")[];
             };
             query: (key: string) => Omit<import("..").ShortcutItem, "callback">;
             update: (key: string, info: KeyboardEvent | Partial<import("..").ShortcutSignatureInfo>) => void;
@@ -69,7 +69,7 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             currentSetShortcut: import("vue").ComputedRef<string>;
             state: import("vue").Ref<import("./constant").ShortcutInputState>;
             isEditState: import("vue").ComputedRef<boolean>;
-            hasOperation: (operation: "disabled" | "reset") => boolean;
+            hasOperation: (operation: "reset" | "state") => boolean;
             currentEditShortcut: import("vue").Ref<string>;
             showContent: import("vue").ComputedRef<string>;
             placeholder: import("vue").ComputedRef<string>;
@@ -4397,8 +4397,8 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
-                afterRequest(payload?: 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").WithUndefined<import("../../../es/src/types").AnyObject>;
+                afterRequest(fieldKey: string, payload?: import("../../../es/src/types").AnyObject[] | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject[]>;
             }>>;
         };
     }, {
@@ -4512,8 +4512,8 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
-                    afterRequest(payload?: 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").WithUndefined<import("../../../es/src/types").AnyObject>;
+                    afterRequest(fieldKey: string, payload?: import("../../../es/src/types").AnyObject[] | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject[]>;
                 }>>;
             };
         }>> & {
@@ -6014,8 +6014,8 @@ declare const ShortcutSetter: SFCWithInstall<import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(params?: import("../../../es/src/types").AnyObject | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject>;
-                afterRequest(payload?: 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").WithUndefined<import("../../../es/src/types").AnyObject>;
+                afterRequest(fieldKey: string, payload?: import("../../../es/src/types").AnyObject[] | undefined): void | import("../../../es/src/types").WithUndefined<import("../../../es/src/types").AnyObject[]>;
             }>>;
         };
     }>> & {

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

@@ -57,7 +57,7 @@ declare const _default: import("vue").DefineComponent<{
                 fieldItem: FieldItem;
                 placeholder: string;
                 editPlaceholder: string;
-                operation: ("disabled" | "reset")[];
+                operation: ("reset" | "state")[];
             };
             query: (key: string) => Omit<import("../../../../es/packages/shortcut-provider").ShortcutItem, "callback">;
             update: (key: string, info: KeyboardEvent | Partial<import("../../../../es/packages/shortcut-provider").ShortcutSignatureInfo>) => void;
@@ -69,7 +69,7 @@ declare const _default: import("vue").DefineComponent<{
             currentSetShortcut: import("vue").ComputedRef<string>;
             state: import("vue").Ref<import("../constant").ShortcutInputState>;
             isEditState: import("vue").ComputedRef<boolean>;
-            hasOperation: (operation: "disabled" | "reset") => boolean;
+            hasOperation: (operation: "reset" | "state") => boolean;
             currentEditShortcut: import("vue").Ref<string>;
             showContent: import("vue").ComputedRef<string>;
             placeholder: import("vue").ComputedRef<string>;
@@ -4397,8 +4397,8 @@ declare const _default: import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(params?: import("../../../src/types").AnyObject | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject>;
-                afterRequest(payload?: import("../../../src/types").AnyObject[] | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject[]>;
+                beforeRequest(fieldKey: string, params?: import("../../../src/types").AnyObject | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject>;
+                afterRequest(fieldKey: string, payload?: import("../../../src/types").AnyObject[] | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject[]>;
             }>>;
         };
     }, {
@@ -4512,8 +4512,8 @@ declare const _default: import("vue").DefineComponent<{
             lifeCycle: {
                 type: import("vue").PropType<Partial<{
                     onSetup(): void;
-                    beforeRequest(params?: import("../../../src/types").AnyObject | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject>;
-                    afterRequest(payload?: import("../../../src/types").AnyObject[] | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject[]>;
+                    beforeRequest(fieldKey: string, params?: import("../../../src/types").AnyObject | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject>;
+                    afterRequest(fieldKey: string, payload?: import("../../../src/types").AnyObject[] | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject[]>;
                 }>>;
             };
         }>> & {
@@ -6014,8 +6014,8 @@ declare const _default: import("vue").DefineComponent<{
         lifeCycle: {
             type: import("vue").PropType<Partial<{
                 onSetup(): void;
-                beforeRequest(params?: import("../../../src/types").AnyObject | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject>;
-                afterRequest(payload?: import("../../../src/types").AnyObject[] | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject[]>;
+                beforeRequest(fieldKey: string, params?: import("../../../src/types").AnyObject | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject>;
+                afterRequest(fieldKey: string, payload?: import("../../../src/types").AnyObject[] | undefined): void | import("../../../src/types").WithUndefined<import("../../../src/types").AnyObject[]>;
             }>>;
         };
     }>> & {

package/es/packages/shortcut-setter/src/ShortcutSetterItem.js

@@ -99,7 +99,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           onKeyup: withModifiers(unref(onInputKeyUp), ["prevent", "stop"])
         }, null, 8, ["disabled", "value", "placeholder", "onKeydown", "onKeyup"]),
         createElementVNode("section", _hoisted_2, [
-          hasOperation("disabled") ? (openBlock(), createBlock(unref(NButton), {
+          hasOperation("state") ? (openBlock(), createBlock(unref(NButton), {
             key: 0,
             text: "",
             onClick: onStop,

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

@@ -47,7 +47,7 @@ declare const _default: import("vue").DefineComponent<{
         fieldItem: FieldItem;
         placeholder: string;
         editPlaceholder: string;
-        operation: Array<'disabled' | 'reset'>;
+        operation: Array<'state' | 'reset'>;
     };
     query: (key: string) => Omit<import("../../../../es/packages/shortcut-provider").ShortcutItem, "callback">;
     update: (key: string, info: KeyboardEvent | Partial<import("../../../../es/packages/shortcut-provider").ShortcutSignatureInfo>) => void;
@@ -59,7 +59,7 @@ declare const _default: import("vue").DefineComponent<{
     currentSetShortcut: import("vue").ComputedRef<string>;
     state: import("vue").Ref<ShortcutInputState>;
     isEditState: import("vue").ComputedRef<boolean>;
-    hasOperation: (operation: 'disabled' | 'reset') => boolean;
+    hasOperation: (operation: 'state' | 'reset') => boolean;
     currentEditShortcut: import("vue").Ref<string>;
     showContent: import("vue").ComputedRef<string>;
     placeholder: import("vue").ComputedRef<string>;

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

@@ -0,0 +1,29 @@
+import { Ref, UnwrapRef, WritableComputedOptions, WritableComputedRef, ComputedRef } from 'vue';
+interface GetState<T> {
+    (isRef: true): Ref<UnwrapRef<T>>;
+    (isRef?: false): UnwrapRef<T>;
+}
+export declare function useState<T>(initValue?: T): [GetState<T>, (val: UnwrapRef<T>) => UnwrapRef<T>];
+export declare function useRef<T>(): GetState<T | null>;
+/**
+ * v-for的ref引用
+ */
+export declare function useRefs<T>(): [Set<T>, (el: T) => void];
+/**
+ * v-for的ref引用
+ * @return 数组
+ */
+export declare function useRefsArray<T>(): [T[], (el: T) => void];
+interface GetComputed<T, R> {
+    (isRef: true): R;
+    (isRef: false): T;
+    (): T;
+}
+export declare function useComputed<T>(getter: WritableComputedOptions<T>['get']): GetComputed<T, ComputedRef<T>>;
+export declare function useComputed<T>(options: WritableComputedOptions<T>): [GetComputed<T, WritableComputedRef<T>>, (val: T) => void];
+/**
+ * 返回{ [key]: Ref }
+ * @params obj { [变量名]: useState或useComputed返回的getter函数 }
+ */
+export declare function getRefs(obj: Record<string, GetState<any> | GetComputed<any, any>>): Record<string, Ref<any>>;
+export {};

package/es/src/utils/state.js

@@ -0,0 +1,44 @@
+import { ref, onBeforeUpdate, computed, unref } from 'vue';
+
+function useState(initValue) {
+  const state = ref(initValue);
+  const getState = (isRef) => isRef ? state : unref(state);
+  return [getState, (val) => state.value = val];
+}
+function useRef() {
+  return useState(null)[0];
+}
+function useRefs() {
+  const itemRefs = /* @__PURE__ */ new Set();
+  const setItemRef = (el) => el && itemRefs.add(el);
+  onBeforeUpdate(() => itemRefs.clear());
+  return [itemRefs, setItemRef];
+}
+function useRefsArray() {
+  let itemRefs = [];
+  const setItemRef = (el) => {
+    itemRefs.push(el);
+  };
+  onBeforeUpdate(() => {
+    itemRefs = [];
+  });
+  return [itemRefs, setItemRef];
+}
+function isWritableComputedOptions(arg) {
+  return typeof arg === "object" && Reflect.has(arg || {}, "set");
+}
+function useComputed(arg) {
+  const data = isWritableComputedOptions(arg) ? computed(arg) : computed(arg);
+  const getData = (isRef) => isRef ? data : data.value;
+  if (!isWritableComputedOptions(arg)) {
+    return getData;
+  }
+  return [getData, (val) => data.value = val];
+}
+function getRefs(obj) {
+  const result = {};
+  Object.entries(obj).forEach(([k, fn]) => result[k] = fn(true));
+  return result;
+}
+
+export { getRefs, useComputed, useRef, useRefs, useRefsArray, useState };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cnhis-design-vue",
   "private": false,
-  "version": "3.1.15-beta.5",
+  "version": "3.1.15-beta.8",
   "license": "ISC",
   "module": "es/packages/index.js",
   "main": "es/packages/index.js",
@@ -90,6 +90,7 @@
     "@types/markdown-it": "^12.2.3",
     "@types/node": "^17.0.38",
     "@types/replacestream": "^4.0.1",
+    "@types/sortablejs": "^1.13.0",
     "@types/vue-router": "^2.0.0",
     "@typescript-eslint/eslint-plugin": "^5.30.7",
     "@typescript-eslint/parser": "^5.30.7",