cnhis-design-vue 3.3.1-release.5 → 3.3.2-release.0

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

@@ -1,13 +1,14 @@
+import { uuidGenerator } from '../../../../shared/utils/index.js';
 import { isField } from '@formily/core';
 import { isObject, isPromise } from '@vue/shared';
 import { isString, isArray, isFunction, noop } from 'lodash-es';
+import '../../index.js';
+import { parseEnhanceText } from './index.js';
 
 function traverseSchema(schema, handler, parent) {
   handler(schema, parent);
   if (isObject(schema.properties)) {
-    Object.values(schema.properties).forEach((_s) => {
-      traverseSchema(_s, handler, schema);
-    });
+    Object.values(schema.properties).forEach((_s) => traverseSchema(_s, handler, schema));
   }
 }
 function fieldKeyEscape(fieldList) {
@@ -45,9 +46,7 @@ function traverseDependKey(dependKeys, handler) {
         }
       });
     } else if (isObject(dependKeys)) {
-      Object.entries(dependKeys).forEach(([k, v]) => {
-        result.set(k, v);
-      });
+      Object.entries(dependKeys).forEach(([k, v]) => result.set(k, v));
     } else if (isString(dependKeys)) {
       result.set(dependKeys, dependKeys);
     }
@@ -71,25 +70,71 @@ function getParentLinebar(key, fieldList) {
     return field.html_type === "LINEBAR";
   }
 }
+function isEmptyValue(v1) {
+  return [null, void 0, ""].includes(v1);
+}
+function getOrInit(origin, key, initValue) {
+  return key in origin ? origin[key] : origin[key] = initValue;
+}
+const DEFAULT_TEXT = '\u60A8\u5C06\u628A\u654F\u611F\u5B57\u6BB5"#{fieldName}"\u7531#{oldValue}\u6539\u4E3A#{newValue}\uFF0C\u8BF7\u52A1\u5FC5\u786E\u8BA4\u66F4\u6539\u524D\u540E\u7684\u6863\u6848\u5747\u4E3A\u540C\u4E00\u4EBA\uFF0C\u5426\u5219\u53EF\u80FD\u4F1A\u9020\u6210\u60A3\u8005\u6863\u6848\u6DF7\u4E71\u7684\u4E25\u91CD\u540E\u679C\uFF01\uFF01\uFF01';
 function assignUpdateValue(props, field) {
   const _props = {
     ...props
   };
   if (isField(field)) {
     Object.assign(_props, {
-      "onUpdate:value"(value) {
-        var _a;
-        const beforeSetValue = (_a = field.decoratorProps) == null ? void 0 : _a.beforeSetValue;
+      async "onUpdate:value"(value) {
+        const $dialog = field.decoratorProps.dialogFn;
+        const fieldItem = field.decoratorProps.fieldItem;
+        const {
+          confirmBeforeValueChangeProps: dialogProps,
+          confirmBeforeValueChange: confirm,
+          confirmBeforeValueChangeText: confirmText
+        } = fieldItem;
+        const oldValue = (dialogProps == null ? void 0 : dialogProps.updateOriginValue) ? field.value : getOrInit(fieldItem, "__oldValue", field.value);
+        const valueMap = {
+          newValue: value,
+          oldValue,
+          fieldName: field.title
+        };
+        if (confirm && $dialog && !isEmptyValue(oldValue) && oldValue !== value) {
+          try {
+            await new Promise((resolve, reject) => {
+              var _a, _b, _c;
+              const params = {
+                title: ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.228")) || "\u8B66\u544A",
+                positiveText: ((_b = window.getLanguageByCode) == null ? void 0 : _b.call(window, "10010.1.27")) || "\u786E\u5B9A",
+                negativeText: ((_c = window.getLanguageByCode) == null ? void 0 : _c.call(window, "10010.1.28")) || "\u53D6\u6D88",
+                onPositiveClick: resolve,
+                onNegativeClick: reject,
+                content: confirmText != null ? confirmText : DEFAULT_TEXT,
+                ...fieldItem.confirmBeforeValueChangeProps
+              };
+              const _content = params.content;
+              isFunction(_content) && (params.content = () => _content(valueMap));
+              isString(_content) && (params.content = parseEnhanceText(_content).reduce((res, item) => {
+                var _a2;
+                if (item.type === "text")
+                  res += item.content;
+                if (item.type === "widget")
+                  res += (_a2 = valueMap[item.content]) != null ? _a2 : field.value;
+                return res;
+              }, ""));
+              $dialog.warning(params);
+            });
+          } catch (e) {
+            field.setValue(oldValue);
+            field.componentProps.updateKey = uuidGenerator();
+            return;
+          }
+        }
+        const beforeSetValue = field.decoratorProps.beforeSetValue;
         if (isFunction(beforeSetValue)) {
           const res = beforeSetValue(field.path.toString(), value, {
             field,
-            oldValue: field.value
+            oldValue
           });
-          if (isPromise(res)) {
-            return res.then((v) => field.setValue(v), noop);
-          } else {
-            return field.setValue(res);
-          }
+          return isPromise(res) ? res.then((v) => field.setValue(v), noop) : field.setValue(res);
         }
         field.setValue(value);
       }

package/es/components/guide/src/renderer.d.ts

@@ -14,7 +14,7 @@ export declare function createGuideStep(instance?: ComponentInternalInstance | n
         type: NumberConstructor;
         required: true;
     };
-}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "toNext" | "next")[], "cancel" | "toNext" | "next", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+}, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("cancel" | "next" | "toNext")[], "cancel" | "next" | "toNext", import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
     config: {
         type: PropType<GuideDefine.Config>;
         required: true;
@@ -30,8 +30,8 @@ export declare function createGuideStep(instance?: ComponentInternalInstance | n
     };
 }>> & {
     onCancel?: ((...args: any[]) => any) | undefined;
-    onToNext?: ((...args: any[]) => any) | undefined;
     onNext?: ((...args: any[]) => any) | undefined;
+    onToNext?: ((...args: any[]) => any) | undefined;
 }, {
     config: GuideDefine.Config;
 }> | import("vue").DefineComponent<{}, () => JSX.Element, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;

package/es/components/iho-chat/src/components/PersonProfile.vue2.js

@@ -170,7 +170,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           round: "",
           size: 100,
           onClickCapture: _cache[0] || (_cache[0] = ($event) => showLargeAvatar.value = true)
-        }, null, 8, ["src"]), createCommentVNode(' <n-upload abstract accept="image/*" @change="onChange">\r\n							<n-upload-trigger #="{ handleClick }" abstract>\r\n								<n-button\r\n									circle\r\n									secondary\r\n									class="edit-avatar"\r\n									v-show="userDetail.id === state.userInfo.id"\r\n									@click="handleClick"\r\n								>\r\n									<template #icon>\r\n										<n-icon size="16" color="#666666" :component="Camera" />\r\n									</template>\r\n								</n-button>\r\n							</n-upload-trigger>\r\n						</n-upload> '), createElementVNode("div", _hoisted_4, [createElementVNode("h4", null, [createElementVNode("label", _hoisted_5, toDisplayString(userDetail.name), 1), withDirectives(createElementVNode("label", {
+        }, null, 8, ["src"]), createCommentVNode(' <n-upload abstract accept="image/*" @change="onChange">\n							<n-upload-trigger #="{ handleClick }" abstract>\n								<n-button\n									circle\n									secondary\n									class="edit-avatar"\n									v-show="userDetail.id === state.userInfo.id"\n									@click="handleClick"\n								>\n									<template #icon>\n										<n-icon size="16" color="#666666" :component="Camera" />\n									</template>\n								</n-button>\n							</n-upload-trigger>\n						</n-upload> '), createElementVNode("div", _hoisted_4, [createElementVNode("h4", null, [createElementVNode("label", _hoisted_5, toDisplayString(userDetail.name), 1), withDirectives(createElementVNode("label", {
           class: normalizeClass(["iho-chatRole", unref(isDoctorRole)(userDetail.roleInfo) ? "isDoctor" : ""])
         }, toDisplayString(unref(getRoleName)(userDetail.roleInfo)), 3), [[vShow, unref(getRoleName)(userDetail.roleInfo)]])]), createElementVNode("p", null, toDisplayString(userDetail.orgName), 1)]), createVNode(unref(NButton), {
           strong: "",

package/es/components/iho-table/index.d.ts

@@ -37,6 +37,9 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    nConfigProviderProps: {
+        type: import("vue").PropType<import("../../shared/types").AnyObject>;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         tableConfig: {
@@ -69,6 +72,9 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
             type: BooleanConstructor;
             default: boolean;
         };
+        nConfigProviderProps: {
+            type: import("vue").PropType<import("../../shared/types").AnyObject>;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
         onScroll?: ((...args: any[]) => any) | undefined;
@@ -3324,7 +3330,10 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
     }>;
     updateConfigRefDebounced: () => void;
     updateConfigRef: () => void;
-    themeOverrides: import("vue").ComputedRef<import("naive-ui").GlobalThemeOverrides>;
+    configBindProps: import("vue").ComputedRef<{
+        namespace: string;
+        themeOverrides: any;
+    }>;
     fieldListRef: import("vue").Ref<{
         [x: string]: any;
         property?: string | undefined;
@@ -6896,6 +6905,9 @@ declare const IhoTable: SFCWithInstall<import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    nConfigProviderProps: {
+        type: import("vue").PropType<import("../../shared/types").AnyObject>;
+    };
 }>> & {
     onFormChange?: ((...args: any[]) => any) | undefined;
     onScroll?: ((...args: any[]) => any) | undefined;

package/es/components/iho-table/src/IhoTable.vue.d.ts

@@ -1,6 +1,5 @@
 import { FormRequestDefine, useVersion } from '../../../shared/hooks';
 import { AnyFn, AnyObject } from '../../../shared/types';
-import { GlobalThemeOverrides } from 'naive-ui';
 import { PropType } from 'vue';
 import { VxeTableInstance } from 'vxe-table';
 import { AnnotationItem } from '../../../components/annotation-edit/src/type';
@@ -36,6 +35,9 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    nConfigProviderProps: {
+        type: PropType<AnyObject>;
+    };
 }, {
     props: Readonly<import("@vue/shared").LooseRequired<Readonly<import("vue").ExtractPropTypes<{
         tableConfig: {
@@ -68,6 +70,9 @@ declare const _default: import("vue").DefineComponent<{
             type: BooleanConstructor;
             default: boolean;
         };
+        nConfigProviderProps: {
+            type: PropType<AnyObject>;
+        };
     }>> & {
         onFormChange?: ((...args: any[]) => any) | undefined;
         onScroll?: ((...args: any[]) => any) | undefined;
@@ -3323,7 +3328,10 @@ declare const _default: import("vue").DefineComponent<{
     }>;
     updateConfigRefDebounced: () => void;
     updateConfigRef: () => void;
-    themeOverrides: import("vue").ComputedRef<GlobalThemeOverrides>;
+    configBindProps: import("vue").ComputedRef<{
+        namespace: string;
+        themeOverrides: any;
+    }>;
     fieldListRef: import("vue").Ref<{
         [x: string]: any;
         property?: string | undefined;
@@ -6895,6 +6903,9 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
+    nConfigProviderProps: {
+        type: PropType<AnyObject>;
+    };
 }>> & {
     onFormChange?: ((...args: any[]) => any) | undefined;
     onScroll?: ((...args: any[]) => any) | undefined;

package/es/components/iho-table/src/IhoTable.vue2.js

@@ -49,6 +49,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     developMode: {
       type: Boolean,
       default: false
+    },
+    nConfigProviderProps: {
+      type: Object
     }
   },
   emits: [
@@ -136,22 +139,28 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         $xeTable
       });
     }
-    const themeOverrides = computed(() => {
-      if (!configRef.value.tableRowHeight)
-        return {};
+    const configBindProps = computed(() => {
+      var _a2, _b2, _c, _d, _e, _f, _g;
       const height = widthAppend(configRef.value.rowConfig.height);
+      const defaultTheme = configRef.value.tableRowHeight ? {
+        heightLarge: height,
+        heightMedium: height,
+        heightSmall: height,
+        heightTiny: height
+      } : null;
       return {
-        Input: {
-          heightLarge: height,
-          heightMedium: height,
-          heightSmall: height,
-          heightTiny: height
-        },
-        InternalSelection: {
-          heightLarge: height,
-          heightMedium: height,
-          heightSmall: height,
-          heightTiny: height
+        ...props.nConfigProviderProps,
+        namespace: `vxe-table--ignore-clear ${(_b2 = (_a2 = props.nConfigProviderProps) == null ? void 0 : _a2.namespace) != null ? _b2 : ""}`,
+        themeOverrides: {
+          ...(_c = props.nConfigProviderProps) == null ? void 0 : _c.themeOverrides,
+          Input: {
+            ...defaultTheme,
+            ...(_e = (_d = props.nConfigProviderProps) == null ? void 0 : _d.themeOverrides) == null ? void 0 : _e.Input
+          },
+          InternalSelection: {
+            ...defaultTheme,
+            ...(_g = (_f = props.nConfigProviderProps) == null ? void 0 : _f.themeOverrides) == null ? void 0 : _g.InternalSelection
+          }
         }
       };
     });
@@ -339,11 +348,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         style: unref(CSSVars)
       }, unref(useVersion)()), [(openBlock(), createBlock(resolveDynamicComponent(unref(header)))), createElementVNode("section", {
         style: normalizeStyle(unref(styles))
-      }, [createVNode(unref(NConfigProvider), {
-        abstract: "",
-        namespace: "vxe-table--ignore-clear",
-        "theme-overrides": unref(themeOverrides)
-      }, {
+      }, [createVNode(unref(NConfigProvider), mergeProps({
+        abstract: ""
+      }, unref(configBindProps)), {
         default: withCtx(() => [createVNode(_component_vxe_grid, mergeProps({
           ref_key: "$table",
           ref: $table
@@ -360,7 +367,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           };
         })]), 1040, ["columns", "data", "loading"])]),
         _: 3
-      }, 8, ["theme-overrides"])], 4), (openBlock(), createBlock(resolveDynamicComponent(unref(footer))))], 16, _hoisted_1);
+      }, 16)], 4), (openBlock(), createBlock(resolveDynamicComponent(unref(footer))))], 16, _hoisted_1);
     };
   }
 });

package/es/components/iho-table/src/plugins/filterRenderPlugin/filter.vue.d.ts

@@ -49,9 +49,15 @@ declare const _default: import("vue").DefineComponent<{
     CancelRadio: import("vue").DefineComponent<{
         currentValue: {};
         cancelable: BooleanConstructor;
+        showType: {
+            type: PropType<"checkbox" | "radio">;
+        };
     }, () => JSX.Element, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         currentValue: {};
         cancelable: BooleanConstructor;
+        showType: {
+            type: PropType<"checkbox" | "radio">;
+        };
     }>>, {
         cancelable: boolean;
     }>;