cnhis-design-vue 3.3.3-beta.61 → 3.3.3-beta.63

package/README.md

@@ -1,87 +1,87 @@
-# 安装
-
-```shell
-npm i cnhis-design-vue@[版本号]
-# or
-yarn add cnhis-design-vue@[版本号] #推荐
-```
-
-## 1.全局引入
-
-```typescript
-// main.ts
-import { createApp } from 'vue';
-import App from './App.vue';
-import 'cnhis-design-vue/es/packages/index.css';
-import cui from 'cnhis-design-vue';
-
-const app = createApp(App);
-app.use(cui).mount('#app');
-```
-
-## 2. 按需引入
-
-组件现在支持了自动按需引入, 但是样式文件需要额外的处理
-
-### 2.1 样式处理方式1 (按需引入样式)
-
-```shell
-# 安装自动导入样式的插件
-npm i -d vite-plugin-style-import
-```
-
-```typescript
-// vite.config.ts
-import { defineConfig } from 'vite';
-import { createStyleImportPlugin } from 'vite-plugin-style-import';
-
-export default defineConfig({
-  plugins: [
-    // ...otherPlugins
-    createStyleImportPlugin({
-      libs: [
-        {
-          libraryName: 'cnhis-design-vue',
-          esModule: true,
-          ensureStyleFile: true,
-          resolveStyle: name => {
-            return `cnhis-design-vue/es/components/${ name.slice(2) }/style/index.css`;
-          }
-        }
-      ]
-    })
-  ]
-});
-```
-
-### 2.2 样式处理方式2 (全局引入样式)
-
-```typescript
-// main.ts
-import 'cnhis-design-vue/es/components/index.css';
-```
-
-## 3.FAQ
-
-### 3.1 项目打包后样式丢失
-
-处理方法, 将 cnhis-design-vue 从 vendor 包中移除 (没有出现此问题则不需要)
-
-```typescript
-// vite.config.ts
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  build: {
-    rollupOptions: {
-      // ..otherOptions
-      output: {
-        dir: './dist',
-        manualChunks: {
-          'cnhis-vendor': ['cnhis-design-vue']
-        }
-      }
-    }
-  }
-});
-```
+# 安装
+
+```shell
+npm i cnhis-design-vue@[版本号]
+# or
+yarn add cnhis-design-vue@[版本号] #推荐
+```
+
+## 1.全局引入
+
+```typescript
+// main.ts
+import { createApp } from 'vue';
+import App from './App.vue';
+import 'cnhis-design-vue/es/packages/index.css';
+import cui from 'cnhis-design-vue';
+
+const app = createApp(App);
+app.use(cui).mount('#app');
+```
+
+## 2. 按需引入
+
+组件现在支持了自动按需引入, 但是样式文件需要额外的处理
+
+### 2.1 样式处理方式1 (按需引入样式)
+
+```shell
+# 安装自动导入样式的插件
+npm i -d vite-plugin-style-import
+```
+
+```typescript
+// vite.config.ts
+import { defineConfig } from 'vite';
+import { createStyleImportPlugin } from 'vite-plugin-style-import';
+
+export default defineConfig({
+  plugins: [
+    // ...otherPlugins
+    createStyleImportPlugin({
+      libs: [
+        {
+          libraryName: 'cnhis-design-vue',
+          esModule: true,
+          ensureStyleFile: true,
+          resolveStyle: name => {
+            return `cnhis-design-vue/es/components/${ name.slice(2) }/style/index.css`;
+          }
+        }
+      ]
+    })
+  ]
+});
+```
+
+### 2.2 样式处理方式2 (全局引入样式)
+
+```typescript
+// main.ts
+import 'cnhis-design-vue/es/components/index.css';
+```
+
+## 3.FAQ
+
+### 3.1 项目打包后样式丢失
+
+处理方法, 将 cnhis-design-vue 从 vendor 包中移除 (没有出现此问题则不需要)
+
+```typescript
+// vite.config.ts
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  build: {
+    rollupOptions: {
+      // ..otherOptions
+      output: {
+        dir: './dist',
+        manualChunks: {
+          'cnhis-vendor': ['cnhis-design-vue']
+        }
+      }
+    }
+  }
+});
+```

package/es/components/button-print/src/components/NewPrintComponent.vue2.js

@@ -535,18 +535,28 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const callLocalServicesErrorCb = (res) => {
       toggleExpandLoading(false);
+      let info = {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId.value,
+        templateCode: getTemplateCodeByFormatId.value
+      };
       encapBrowserLog({
         type: "\u8FDB\u5165\u5931\u8D25\u7684\u56DE\u8C03",
         res
       }, "PRINT-SDK");
-      emit("error", res);
+      emit("error", res, info);
       if (isObject(res) && res.type === "notInstalledApp") {
         $message.error(res.message);
       }
     };
     const callLocalServicesCancelCb = (res) => {
       toggleExpandLoading(false);
-      emit("cancel", res);
+      let info = {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId.value,
+        templateCode: getTemplateCodeByFormatId.value
+      };
+      emit("cancel", res, info);
     };
     const prevFnError = (type) => {
       const error = {
@@ -561,7 +571,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         type,
         preExecution: true
       };
-      emit("error", error);
+      let info = {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId.value,
+        templateCode: getTemplateCodeByFormatId.value
+      };
+      emit("error", error, info);
     };
     const getPrintParams = () => {
       return JSON.stringify({

package/es/components/button-print/src/components/OldPrintComponent.vue2.js

@@ -274,14 +274,22 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     };
     const callLocalServicesErrorCb = (res) => {
       state.spinning = false;
-      emit("error", res);
+      let info = {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId.value
+      };
+      emit("error", res, info);
       if (isObject(res) && res.type === "notInstalledApp") {
         $message.error(res.message);
       }
     };
     const callLocalServicesCancelCb = (res) => {
       state.spinning = false;
-      emit("cancel", res);
+      let info = {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId.value
+      };
+      emit("cancel", res, info);
     };
     const prevFnError = (type) => {
       const error = {
@@ -296,7 +304,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         type,
         preExecution: true
       };
-      emit("error", error);
+      let info = {
+        formatId: state.currentFormatId,
+        templateId: getTemplateIdByFormatId.value
+      };
+      emit("error", error, info);
     };
     const getPrintParams = (index = 0) => {
       var _a2;

package/es/components/button-print/src/utils/print.js

@@ -3,7 +3,8 @@ import { cloneDeep, isArray } from 'lodash-es';
 import { IdentityVerificationDialog, PreviewDialog } from './dialog.js';
 import { isIReport, getFileUrl, useBrowserPrint } from './browserPrint.js';
 import { h, getCurrentInstance } from 'vue';
-import { createDiscreteApi, NProgress, NDivider } from 'naive-ui';
+import { createDiscreteApi, NIcon, NProgress, NDivider } from 'naive-ui';
+import { PrintOutline } from '@vicons/ionicons5';
 import { uuidGenerator } from '../../../../shared/utils/index.js';
 import { format } from 'date-fns';
 import { io } from 'socket.io-client';
@@ -262,7 +263,13 @@ class Print {
             overflow: "hidden",
             marginBottom: "4px"
           }
-        }, [h("span", {
+        }, [h(NIcon, {
+          size: 16,
+          component: PrintOutline,
+          style: {
+            marginRight: "4px"
+          }
+        }), h("span", {
           style: {
             flex: 1,
             fontSize: "14px",

package/es/components/classification/src/components/table-modal/index.vue.d.ts

@@ -175,6 +175,9 @@ declare const _default: import("vue").DefineComponent<{
         modelValue: unknown[];
         componentData: Record<string, any>;
     } & {
+        /**
+         * 改变弹窗大小
+         */
         itemKey?: string | Function | undefined;
     }>, {
         move: Function;

package/es/components/field-set/src/FieldColor.vue.d.ts

@@ -539,9 +539,9 @@ declare const _default: import("vue").DefineComponent<{
         }>;
         developMode: boolean;
         draggable: boolean;
+        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
-        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

package/es/components/field-set/src/FieldFilter.vue.d.ts

@@ -568,9 +568,9 @@ declare const _default: import("vue").DefineComponent<{
         }>;
         developMode: boolean;
         draggable: boolean;
+        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
-        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

package/es/components/field-set/src/FieldSet.vue.d.ts

@@ -759,9 +759,9 @@ declare const _default: import("vue").DefineComponent<{
         }>;
         developMode: boolean;
         draggable: boolean;
+        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
-        isHighlightRow: boolean;
         isFieldSet: boolean;
         fieldDescribeMode: "column" | "tooltip";
         hideExpressionOption: AnyObject[];

package/es/components/field-set/src/components/table-row.vue.d.ts

@@ -384,9 +384,9 @@ declare const _default: import("vue").DefineComponent<{
     }>;
     developMode: boolean;
     draggable: boolean;
+    isHighlightRow: boolean;
     idx: number;
     isHighlight: boolean;
-    isHighlightRow: boolean;
     isFieldSet: boolean;
     fieldDescribeMode: "column" | "tooltip";
     hideExpressionOption: AnyObject[];

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

@@ -603,7 +603,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }, {
           default: withCtx(() => [!unref(isAudioOrVideoMessage)(item.content) ? (openBlock(), createElementBlock(Fragment, {
             key: 0
-          }, [createCommentVNode(' <n-button\n												quaternary\n												size="tiny"\n												@click="(event: MouseEvent) => handleSelectLabel(event, item.id)"\n											>\n												<template #icon>\n													<n-icon size="17" :component="HappyOutline" />\n												</template>\n											</n-button> '), createVNode(unref(NButton), {
+          }, [createCommentVNode(' <n-button\r\n												quaternary\r\n												size="tiny"\r\n												@click="(event: MouseEvent) => handleSelectLabel(event, item.id)"\r\n											>\r\n												<template #icon>\r\n													<n-icon size="17" :component="HappyOutline" />\r\n												</template>\r\n											</n-button> '), createVNode(unref(NButton), {
             quaternary: "",
             size: "tiny",
             onClick: () => setReferenceMsg(item)

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

@@ -225,7 +225,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">\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", {
+        }, 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", {
           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/keyboard/index.d.ts

@@ -201,6 +201,7 @@ declare const Keyboard: SFCWithInstall<import("vue").DefineComponent<{
         calculateFraction: () => void;
         setInputStatus: (valueRef: import("vue").Ref<string>, statusRef: import("vue").Ref<string>, isInteger?: boolean | undefined) => true | undefined;
         setInputValueStatus: () => void;
+        safeEval: (expression: string) => number;
         setPosition: (position: import("@vueuse/core").Position) => void;
         getPosition: () => import("@vueuse/core").Position;
         NIcon: any;

package/es/components/keyboard/src/Keyboard.vue.d.ts

@@ -203,6 +203,7 @@ declare const _default: import("vue").DefineComponent<{
         calculateFraction: () => void;
         setInputStatus: (valueRef: import("vue").Ref<string>, statusRef: import("vue").Ref<string>, isInteger?: boolean | undefined) => true | undefined;
         setInputValueStatus: () => void;
+        safeEval: (expression: string) => number;
         setPosition: (position: Position) => void;
         getPosition: () => Position;
         NIcon: any;

package/es/components/keyboard/src/components/NumberPanel.vue.d.ts

@@ -93,6 +93,7 @@ declare const _default: import("vue").DefineComponent<{
     calculateFraction: () => void;
     setInputStatus: (valueRef: Ref<string>, statusRef: Ref<string>, isInteger?: boolean) => true | undefined;
     setInputValueStatus: () => void;
+    safeEval: (expression: string) => number;
     setPosition: (position: Position) => void;
     getPosition: () => Position;
     NIcon: any;

package/es/components/keyboard/src/components/NumberPanel.vue2.js

@@ -112,7 +112,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             inputValueStatus.value = "error";
             return;
           }
-          emit("change", eval(inputValue.value));
+          const result = safeEval(inputValue.value);
+          emit("change", result);
           setFocus();
           break;
         }
@@ -132,7 +133,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return;
       keydown("Enter");
     }
-    async function updateValue(key2) {
+    async function updateValue(key) {
       var _a, _b, _c;
       const inputRefS = (_c = (_b = (_a = inputRef.value) == null ? void 0 : _a.$childrenRefs) == null ? void 0 : _b.$refs) == null ? void 0 : _c.inputElRef;
       const {
@@ -140,18 +141,18 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         selectionEnd
       } = inputRefS;
       const arr = inputValue.value.split("");
-      if (key2 === "Undo") {
+      if (key === "Undo") {
         const num = selectionStart === selectionEnd ? 1 : selectionEnd - selectionStart;
         const startIdx = selectionStart === selectionEnd ? selectionStart - 1 : selectionStart;
         if (inputValue.value && startIdx > -1)
           arr.splice(startIdx, num);
       } else {
-        arr.splice(selectionStart, selectionEnd - selectionStart, key2);
+        arr.splice(selectionStart, selectionEnd - selectionStart, key);
       }
       inputValue.value = arr.join("");
       await nextTick();
       inputRefS.focus();
-      const selectionIdx = key2 === "Undo" ? !selectionStart ? 0 : selectionEnd > selectionStart ? selectionStart : selectionStart - 1 : selectionStart + 1;
+      const selectionIdx = key === "Undo" ? !selectionStart ? 0 : selectionEnd > selectionStart ? selectionStart : selectionStart - 1 : selectionStart + 1;
       inputRefS.setSelectionRange(selectionIdx, selectionIdx);
       setInputValueStatus();
     }
@@ -209,6 +210,18 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     function setInputValueStatus() {
       inputValueStatus.value = !inputValue.value ? "error" : "success";
     }
+    function safeEval(expression) {
+      const cleanExpression = expression.replace(/\b0+(\d)/g, "$1").replace(/\b0+\./g, "0.");
+      if (/^\d*\.?\d*$/.test(cleanExpression)) {
+        return parseFloat(cleanExpression) || 0;
+      }
+      try {
+        return new Function("return " + cleanExpression)();
+      } catch (error) {
+        console.error("Expression evaluation error:", error);
+        return 0;
+      }
+    }
     function setPosition(position) {
       if (draggableInstance) {
         draggableInstance.x.value = position.x;
@@ -258,12 +271,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         class: "margin-offset",
         "wrap-item": false
       }, {
-        default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(unref(numberKeys), (key2) => {
+        default: withCtx(() => [(openBlock(true), createElementBlock(Fragment, null, renderList(unref(numberKeys), (key) => {
           return openBlock(), createElementBlock("span", {
-            key: key2,
-            class: normalizeClass(key2 === "0" ? "is-0" : ""),
-            onClick: ($event) => keydown(key2)
-          }, toDisplayString(key2), 11, _hoisted_2);
+            key,
+            class: normalizeClass(key === "0" ? "is-0" : ""),
+            onClick: ($event) => keydown(key)
+          }, toDisplayString(key), 11, _hoisted_2);
         }), 128))]),
         _: 1
       }), createVNode(unref(NSpace), {

package/es/env.d.ts

@@ -1,25 +1,25 @@
-/// <reference types="vite/client" />
-
-interface ImportMetaEnv {
-  readonly VITE_APP_TYPE: string;
-  // 更多环境变量...
-}
-
-interface ImportMeta {
-  readonly env: ImportMetaEnv;
-}
-
-declare module '*.vue' {
-// @ts-ignore
-  import type { App, defineComponent } from 'vue';
-  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
-  // // const component: DefineComponent<{}, {}, any>
-  const component: ReturnType<typeof defineComponent> & {
-    install(app: App): void;
-  };
-  // @ts-ignore
-  export default component;
-}
-
-declare module '*.js';
-
+/// <reference types="vite/client" />
+
+interface ImportMetaEnv {
+  readonly VITE_APP_TYPE: string;
+  // 更多环境变量...
+}
+
+interface ImportMeta {
+  readonly env: ImportMetaEnv;
+}
+
+declare module '*.vue' {
+// @ts-ignore
+  import type { App, defineComponent } from 'vue';
+  // // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/ban-types
+  // // const component: DefineComponent<{}, {}, any>
+  const component: ReturnType<typeof defineComponent> & {
+    install(app: App): void;
+  };
+  // @ts-ignore
+  export default component;
+}
+
+declare module '*.js';
+

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.3.3-beta.61";
+var version = "3.3.3-beta.63";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.3.3-beta.61",
+	"version": "3.3.3-beta.63",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -74,5 +74,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "ca79a2e2af6d422573c63bc2237ea3f64fd59a6e"
+	"gitHead": "15df50851026873ba4c19746fc7f7c588ad7cf8f"
 }