cnhis-design-vue 3.3.3-beta.42 → 3.3.3-beta.45

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

@@ -753,6 +753,7 @@ class Print {
     templateId,
     number,
     formatId: originFormatId,
+    formatItem,
     params = "",
     paramsArr,
     authorizationKey,
@@ -785,6 +786,8 @@ class Print {
     if (!this._handleResultTest(testResult, errorCallbackFn))
       return false;
     try {
+      const hideButtonsValue = hideButtons ? hideButtons : (formatItem == null ? void 0 : formatItem.previewCanExport) === void 0 || (formatItem == null ? void 0 : formatItem.previewCanExport) ? void 0 : "Export";
+      const btnprintValue = btnprint != "1" ? btnprint : (formatItem == null ? void 0 : formatItem.previewCanPrint) === false ? "0" : "1";
       const result = await this._handleEventDirect({
         templateId,
         number,
@@ -793,8 +796,8 @@ class Print {
         paramsArr,
         cmdid: this.isRemote ? PRINT_CMD_ID : PREVIEW_CMD_ID,
         signature,
-        btnprint,
-        hideButtons,
+        btnprint: btnprintValue,
+        hideButtons: hideButtonsValue,
         messageTimeout
       });
       const handledResult = this._handleResult(result, errorCallbackFn);
@@ -983,6 +986,7 @@ class Print {
         }];
         params = "";
       }
+      const printdlgshowValue = printdlgshow != "0" ? printdlgshow : (formatItem == null ? void 0 : formatItem.showPrintDialog) ? "1" : "0";
       const result = await this._handleEventDirect({
         templateId,
         number,
@@ -992,7 +996,7 @@ class Print {
         cmdid: PRINT_CMD_ID,
         print,
         signature,
-        printdlgshow,
+        printdlgshow: printdlgshowValue,
         nobillnode,
         copies,
         svrUpdateIp,

package/es/components/button-print/style/index.css

@@ -1 +1 @@
-.dropdown-button{border-color:#d5d5d5!important;color:#212121;padding-right:0}.dropdown-button .n-button__content{height:100%}.dropdown-button .n-button__content .n-icon{align-items:center;display:flex;height:100%;justify-content:center;padding-right:10px;width:30px}.c-dropdown .n-dropdown-menu-wrapper span.active{color:#5585f5}.login-form-button{border-radius:24px;color:#fff;font-size:16px;height:50px;width:100%}.login-form-button-print{padding-top:15px}.login-form-button-print .n-input{border-radius:6px;color:#757575;font-size:14px;height:50px;line-height:50px}.c-button-print-modal .n-form-item-feedback-wrapper{display:none}.c-button-preview-modal{max-width:none!important}.c-button-preview-modal .n-dialog__content{height:98%}.newprint-button-component .icon-select{padding:0 8px!important}.newprint-button-poperOver{border-radius:3px;overflow-y:auto}.newprint-button-poperOver .bold{font-weight:700}.newprint-button-poperOver .isDisabled{color:#999;cursor:default}.newprint-button-poperOver .print-li{overflow:hidden}.newprint-button-poperOver .print-li .n-divider{margin-bottom:6px;margin-top:6px}.newprint-button-poperOver .print-li .print-lite{align-items:center;border-radius:3px;cursor:pointer;display:flex;height:32px;justify-content:space-between;margin:3px 0}.newprint-button-poperOver .print-li .print-lite .label{padding:0 8px;white-space:nowrap}.newprint-button-poperOver .print-li .print-lite .n-icon{align-items:center;border-radius:0 3px 3px 0;display:flex;height:100%;justify-content:center;width:30px}.newprint-button-poperOver .print-li .print-lite .n-checkbox{white-space:nowrap}.newprint-button-poperOver .print-li.active{color:#2563f4}.newprint-button-poperOver .print-li.active .print-lite{background:rgba(37,99,244,.1)}.newprint-button-poperOver .print-li.active .n-icon{background:rgba(37,99,244,.15)}.newprint-button-outer{align-items:center;display:flex;overflow-x:auto}.newprint-button-outer .outButtonGroup .isPrintDisabled .n-button__border{border-right-width:0!important}.newprint-button-outer .outButtonGroup .n-button.n-button--disabled+.n-button.n-button--default-type:not(.n-button--disabled) .n-button__border{border-left-width:1px!important}.newprint-button-outer .outerLastButton .n-button__border{border-bottom-right-radius:0;border-right:none;border-top-right-radius:0}.newprint-button-outer .outerLastButton:hover .n-button__state-border{border-bottom-right-radius:0;border-top-right-radius:0}.newprint-button-outer .printAllLeftCls .n-button__border,.newprint-button-outer .printAllLeftCls:hover .n-button__state-border{border-bottom-left-radius:0;border-top-left-radius:0}.newprint-button-outer__shortcut{color:#76797f}
+.dropdown-button{border-color:#d5d5d5!important;color:#212121;padding-right:0}.dropdown-button .n-button__content{height:100%}.dropdown-button .n-button__content .n-icon{align-items:center;display:flex;height:100%;justify-content:center;padding-right:10px;width:30px}.c-dropdown .n-dropdown-menu-wrapper span.active{color:#5585f5}.login-form-button{border-radius:24px;color:#fff;font-size:16px;height:50px;width:100%}.login-form-button-print{padding-top:15px}.login-form-button-print .n-input{border-radius:6px;color:#757575;font-size:14px;height:50px;line-height:50px}.c-button-print-modal .n-form-item-feedback-wrapper{display:none}.c-button-preview-modal{max-width:none!important}.c-button-preview-modal .n-dialog__content{height:98%}.newprint-button-component .icon-select{padding:0 8px!important}.newprint-button-poperOver{border-radius:3px;overflow-y:auto}.newprint-button-poperOver .bold{font-weight:700}.newprint-button-poperOver .isDisabled{color:#999;cursor:default}.newprint-button-poperOver .print-li{overflow:hidden}.newprint-button-poperOver .print-li .n-divider{margin-bottom:6px;margin-top:6px}.newprint-button-poperOver .print-li .print-lite{align-items:center;border-radius:3px;cursor:pointer;display:flex;height:32px;justify-content:space-between;margin:3px 0;white-space:nowrap}.newprint-button-poperOver .print-li .print-lite .label{padding:0 8px;white-space:nowrap}.newprint-button-poperOver .print-li .print-lite .n-icon{align-items:center;border-radius:0 3px 3px 0;display:flex;height:100%;justify-content:center;width:30px}.newprint-button-poperOver .print-li .print-lite .n-checkbox{white-space:nowrap}.newprint-button-poperOver .print-li.active{color:#2563f4}.newprint-button-poperOver .print-li.active .print-lite{background:rgba(37,99,244,.1)}.newprint-button-poperOver .print-li.active .print-li-icon{background:rgba(37,99,244,.15)}.newprint-button-poperOver .print-li .print-preview-item:hover{color:#2563f4}.newprint-button-outer{align-items:center;display:flex;overflow-x:auto}.newprint-button-outer .outButtonGroup .isPrintDisabled .n-button__border{border-right-width:0!important}.newprint-button-outer .outButtonGroup .n-button.n-button--disabled+.n-button.n-button--default-type:not(.n-button--disabled) .n-button__border{border-left-width:1px!important}.newprint-button-outer .outerLastButton .n-button__border{border-bottom-right-radius:0;border-right:none;border-top-right-radius:0}.newprint-button-outer .outerLastButton:hover .n-button__state-border{border-bottom-right-radius:0;border-top-right-radius:0}.newprint-button-outer .printAllLeftCls .n-button__border,.newprint-button-outer .printAllLeftCls:hover .n-button__state-border{border-bottom-left-radius:0;border-top-left-radius:0}.newprint-button-outer__shortcut{color:#76797f}

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/components/table-row.vue2.js

@@ -327,6 +327,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           }
         }
         default:
+          if (isArray(column == null ? void 0 : column.options))
+            return column.options;
           return [];
       }
     }

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

@@ -224,13 +224,26 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           } else {
             chatMessageType = MESSAGE_TYPE.IMAGE;
             const match = innerHTML.match(/src\s*=\s*"([^"]*)"/);
-            if (match) {
-              const file = await base64ToFile(match[1]);
-              if (file) {
-                const data = await doUpdateFile(file);
-                if (data) {
-                  msg = isObject(data) ? JSON.stringify(data) : data;
+            if (match == null ? void 0 : match.length) {
+              if (match[1].startsWith("data:")) {
+                const file = await base64ToFile(match[1]);
+                if (file) {
+                  const data = await doUpdateFile(file);
+                  if (data) {
+                    msg = isObject(data) ? JSON.stringify(data) : data;
+                  }
                 }
+              } else {
+                const filenameMatch = innerHTML.match(/data-filename\s*=\s*"([^"]*)"/);
+                const fileName = filenameMatch ? filenameMatch[1] : "";
+                const filesizeMatch = innerHTML.match(/data-filesize\s*=\s*"([^"]*)"/);
+                const fileSize = filesizeMatch ? filesizeMatch[1] : "";
+                const fileUrl = match[1];
+                msg = JSON.stringify({
+                  fileUrl,
+                  fileName,
+                  fileSize
+                });
               }
             }
           }

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/ContextMenu.js

@@ -168,6 +168,7 @@ var ContextMenu = /* @__PURE__ */ defineComponent({
       emit("update:show", false);
     });
     async function clickMenu(key) {
+      var _a;
       emit("update:show", false);
       const {
         content = {},
@@ -184,27 +185,41 @@ var ContextMenu = /* @__PURE__ */ defineComponent({
             if (!content.msg)
               return console.log("\u590D\u5236\u5185\u5BB9\u4E3A\u7A7A\uFF01");
             const isSupported = navigator && "clipboard" in navigator;
-            if (!isSupported)
-              return console.log("\u5F53\u524D\u6D4F\u89C8\u5668\u7248\u672C\u4E0D\u652F\u6301\u590D\u5236\uFF01");
+            if (!isSupported) {
+              $message.error("\u5F53\u524D\u6D4F\u89C8\u5668\u7248\u672C\u6216\u8005http\u534F\u8BAE\u4E0D\u652F\u6301\u590D\u5236\uFF01");
+              return console.log("\u5F53\u524D\u6D4F\u89C8\u5668\u7248\u672C\u6216\u8005http\u534F\u8BAE\u4E0D\u652F\u6301\u590D\u5236\uFF01");
+            }
             try {
-              if (chatMessageType === MESSAGE_TYPE.TEXT) {
-                await navigator.clipboard.writeText(content.msg);
-              } else {
-                let data;
-                if ([MESSAGE_TYPE.EMOJI, MESSAGE_TYPE.IMAGE].includes(chatMessageType)) {
-                  const url = chatMessageType === MESSAGE_TYPE.EMOJI ? emojis.findEmoji(content.msg) : formatJsonstr(content.msg, "fileUrl");
-                  data = `<img data-msg=${chatMessageType === MESSAGE_TYPE.EMOJI ? content.msg : ""} data-type=${chatMessageType} class=${chatMessageType === MESSAGE_TYPE.EMOJI ? "emoji--min" : "chat-image-copy"} src=${url} />`;
-                } else if (chatMessageType === MESSAGE_TYPE.BLEND) {
+              let data;
+              switch (chatMessageType) {
+                case MESSAGE_TYPE.TEXT:
+                  await navigator.clipboard.writeText(content.msg);
+                  break;
+                case MESSAGE_TYPE.EMOJI: {
+                  const url = emojis.findEmoji(content.msg);
+                  data = `<img data-msg=${content.msg} data-type=${chatMessageType} class="emoji--min" src=${url} />`;
+                  break;
+                }
+                case MESSAGE_TYPE.IMAGE: {
+                  const url = formatJsonstr(content.msg, "fileUrl");
+                  const fileName = formatJsonstr(content.msg, "fileName");
+                  const fileSize = (_a = formatJsonstr(content.msg, "fileSize")) == null ? void 0 : _a.replace(/\s+/g, "");
+                  data = `<img data-filename=${fileName} data-filesize=${fileSize} data-type=${chatMessageType} class="chat-image-copy" src=${url} />`;
+                  break;
+                }
+                case MESSAGE_TYPE.BLEND:
                   data = __content;
-                } else {
+                  break;
+                default:
                   data = content.msg;
-                }
-                await navigator.clipboard.write([new window.ClipboardItem({
-                  "text/html": new Blob([data], {
-                    type: "text/html"
-                  })
-                })]);
+                  break;
               }
+              await navigator.clipboard.write([new window.ClipboardItem({
+                "text/html": new Blob([data], {
+                  type: "text/html"
+                })
+              })]);
+              $message.success("\u590D\u5236\u6210\u529F");
             } catch (error) {
               console.log("\u590D\u5236\u5931\u8D25\uFF01");
             }

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: "",