cnhis-design-vue 3.3.3-beta.25 → 3.3.3-beta.27

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

@@ -536,9 +536,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

@@ -565,9 +565,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

@@ -756,9 +756,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

@@ -383,9 +383,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/index.d.ts

@@ -1690,7 +1690,6 @@ declare const IhoChat: SFCWithInstall<import("vue").DefineComponent<{
         renderToolbar: ({ nodes }: import("naive-ui").ImageRenderToolbarProps) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }>[];
-        formatImage: (obj: string | import("../../shared/types").AnyObject, type: string) => any;
         getHistoryRecord: () => Promise<void>;
         handleSelectLabel: (event: MouseEvent, msgId: string) => void;
         handleContextmenu: (event: MouseEvent, msgId: string) => Promise<void>;
@@ -2272,6 +2271,7 @@ declare const IhoChat: SFCWithInstall<import("vue").DefineComponent<{
         isAudioOrVideoMessage: typeof import("./src/utils").isAudioOrVideoMessage;
         getAVTime: typeof import("./src/utils").getAVTime;
         getForwardTitle: typeof import("./src/utils").getForwardTitle;
+        formatJson: typeof import("./src/utils").formatJson;
         MESSAGE_TYPE: typeof import("./src/constants").MESSAGE_TYPE;
         ChatbubbleEllipsesOutline: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
         EllipsisHorizontal: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;

package/es/components/iho-chat/src/Index.vue.d.ts

@@ -1691,7 +1691,6 @@ declare const _default: import("vue").DefineComponent<{
         renderToolbar: ({ nodes }: import("naive-ui").ImageRenderToolbarProps) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }>[];
-        formatImage: (obj: string | AnyObject, type: string) => any;
         getHistoryRecord: () => Promise<void>;
         handleSelectLabel: (event: MouseEvent, msgId: string) => void;
         handleContextmenu: (event: MouseEvent, msgId: string) => Promise<void>;
@@ -2273,6 +2272,7 @@ declare const _default: import("vue").DefineComponent<{
         isAudioOrVideoMessage: typeof import("./utils").isAudioOrVideoMessage;
         getAVTime: typeof import("./utils").getAVTime;
         getForwardTitle: typeof import("./utils").getForwardTitle;
+        formatJson: typeof import("./utils").formatJson;
         MESSAGE_TYPE: typeof import("./constants").MESSAGE_TYPE;
         ChatbubbleEllipsesOutline: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
         EllipsisHorizontal: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;

package/es/components/iho-chat/src/components/ChatMain.vue.d.ts

@@ -1,7 +1,7 @@
 import { CSSProperties } from 'vue';
 import { ImageRenderToolbarProps } from 'naive-ui';
 import { AnyObject } from '../../../../shared/types';
-import { simplifyMessage, isAudioOrVideoMessage, getAVTime, getForwardTitle } from '../utils';
+import { simplifyMessage, isAudioOrVideoMessage, getAVTime, getForwardTitle, formatJson } from '../utils';
 import { MESSAGE_TYPE } from '../constants';
 declare const _default: import("vue").DefineComponent<{}, {
     chatMainRef: import("vue").Ref<HTMLElement | undefined>;
@@ -71,7 +71,6 @@ declare const _default: import("vue").DefineComponent<{}, {
     renderToolbar: ({ nodes }: ImageRenderToolbarProps) => import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
         [key: string]: any;
     }>[];
-    formatImage: (obj: AnyObject | string, type: string) => any;
     getHistoryRecord: () => Promise<void>;
     handleSelectLabel: (event: MouseEvent, msgId: string) => void;
     handleContextmenu: (event: MouseEvent, msgId: string) => Promise<void>;
@@ -653,6 +652,7 @@ declare const _default: import("vue").DefineComponent<{}, {
     isAudioOrVideoMessage: typeof isAudioOrVideoMessage;
     getAVTime: typeof getAVTime;
     getForwardTitle: typeof getForwardTitle;
+    formatJson: typeof formatJson;
     MESSAGE_TYPE: typeof MESSAGE_TYPE;
     ChatbubbleEllipsesOutline: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     EllipsisHorizontal: import("vue").DefineComponent<{}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;

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

@@ -6,7 +6,7 @@ import { useData } from '../hooks/useData.js';
 import 'stompjs';
 import 'sockjs-client/dist/sockjs.min.js';
 import { MESSAGE_TYPE } from '../constants/index.js';
-import { isAudioOrVideoMessage, simplifyMessage, getForwardTitle, getAVTime, downloadFile } from '../utils/index.js';
+import { isAudioOrVideoMessage, simplifyMessage, getForwardTitle, formatJson, getAVTime, downloadFile } from '../utils/index.js';
 import { first, last, isArray, toString } from 'lodash-es';
 import 'trtc-sdk-v5';
 import MessageTemplate from './MessageTemplate.vue.js';
@@ -142,17 +142,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }()
       }), nodes.close];
     }
-    function formatImage(obj, type) {
-      try {
-        if (typeof obj === "string") {
-          const objParse = JSON.parse(obj);
-          return objParse[type];
-        }
-        return obj[type];
-      } catch (error) {
-        return obj;
-      }
-    }
     async function getHistoryRecord() {
       try {
         if (!pageInfo.hasMore)
@@ -490,7 +479,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           }), 128))])], 8, _hoisted_14)) : createCommentVNode("v-if", true), item.content.chatMessageType === unref(MESSAGE_TYPE).IMAGE ? (openBlock(), createBlock(unref(NImage), {
             key: 4,
             width: "240",
-            src: formatImage(item.__content, "fileUrl"),
+            src: unref(formatJson)(item.__content, "fileUrl"),
             onClick: _cache[0] || (_cache[0] = (event) => event.stopPropagation())
           }, null, 8, ["src"])) : createCommentVNode("v-if", true), unref(isAudioOrVideoMessage)(item.content) ? (openBlock(), createElementBlock(Fragment, {
             key: 5
@@ -515,7 +504,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
                 "row-gap": "0"
               }
             }, {
-              default: withCtx(() => [createElementVNode("span", null, toDisplayString(formatImage(item.__content, "fileName")), 1), createElementVNode("span", _hoisted_19, toDisplayString(item.__size), 1)]),
+              default: withCtx(() => [createElementVNode("span", null, toDisplayString(unref(formatJson)(item.__content, "fileName")), 1), createElementVNode("span", _hoisted_19, toDisplayString(unref(formatJson)(item.__content, "fileSize")), 1)]),
               _: 2
             }, 1024)]),
             _: 2

package/es/components/iho-chat/src/components/ContextMenu.js

@@ -7,7 +7,7 @@ import 'stompjs';
 import 'sockjs-client/dist/sockjs.min.js';
 import { STATUS, MESSAGE_TYPE } from '../constants/index.js';
 import { recallMessageApi } from '../api/index.js';
-import { isAudioOrVideoMessage, $message, downloadFile, getFileDetails } from '../utils/index.js';
+import { isAudioOrVideoMessage, $message, formatJson, downloadFile, getFileDetails } from '../utils/index.js';
 import 'lodash-es';
 import 'trtc-sdk-v5';
 import { emojis } from '../utils/emoji.js';
@@ -211,15 +211,9 @@ var ContextMenu = /* @__PURE__ */ defineComponent({
           }
           return;
         case "download": {
-          let {
-            fileUrl: url,
-            msg: fileName
-          } = content;
-          if (chatMessageType === MESSAGE_TYPE.IMAGE) {
-            url = fileName;
-            fileName = fileName.match(/\/([^\/?#]+)$/)[1];
-          }
-          downloadFile(url, fileName);
+          const fileName = formatJson(__content, "fileName");
+          const fileUrl = formatJson(__content, "fileUrl");
+          downloadFile(fileUrl, fileName);
           return;
         }
         case "withdraw": {

package/es/components/iho-chat/src/hooks/useDraggable.js

@@ -65,6 +65,7 @@ function useDraggable(target, options = {}) {
       topRightElement();
     }
   };
+  const clamp = (val, min, max) => Math.max(min, Math.min(val, max));
   const onMouseDown = (e) => {
     var _a;
     if (!target.value)
@@ -87,12 +88,20 @@ function useDraggable(target, options = {}) {
   };
   const onMouseMove = (e) => {
     var _a;
-    if (!isDragging.value)
+    if (!isDragging.value || !target.value)
       return;
     const dx = e.clientX - startMousePos.value.x;
     const dy = e.clientY - startMousePos.value.y;
-    x.value = startPos.value.x + dx;
-    y.value = startPos.value.y + dy;
+    const {
+      width,
+      height
+    } = target.value.getBoundingClientRect();
+    const minX = 0;
+    const minY = 0;
+    const maxX = window.innerWidth - width;
+    const maxY = window.innerHeight - height;
+    x.value = clamp(startPos.value.x + dx, minX, maxX);
+    y.value = clamp(startPos.value.y + dy, minY, maxY);
     updatePosition();
     (_a = options.onDrag) == null ? void 0 : _a.call(options, {
       x: x.value,

package/es/components/iho-chat/src/utils/index.d.ts

@@ -22,3 +22,4 @@ export declare function getFileDetails(msg: string, type: string): any;
 export declare function getFileType(msg: string): string;
 export declare function getDetail(item: AnyObject, isShowSize?: boolean): string;
 export declare function showAudioAndVideoRecord(chatMessageType: string): "语音通话" | "视频通话";
+export declare function formatJson(obj: AnyObject | string, type: string): any;

package/es/components/iho-chat/src/utils/index.js

@@ -320,5 +320,16 @@ function showAudioAndVideoRecord(chatMessageType) {
     }
   }();
 }
+function formatJson(obj, type) {
+  try {
+    if (typeof obj === "string") {
+      const objParse = JSON.parse(obj);
+      return objParse[type];
+    }
+    return obj[type];
+  } catch (error) {
+    return obj;
+  }
+}
 
-export { $message, base64ToFile, downloadFile, formatSeconds, formatTime, getAVTime, getDetail, getFileDetails, getFileSize, getFileType, getForwardTitle, getRoleName, isAudioOrVideoMessage, isDoctorRole, isGroup, listSort, showAudioAndVideoRecord, simplifyMessage, transformMessage };
+export { $message, base64ToFile, downloadFile, formatJson, formatSeconds, formatTime, getAVTime, getDetail, getFileDetails, getFileSize, getFileType, getForwardTitle, getRoleName, isAudioOrVideoMessage, isDoctorRole, isGroup, listSort, showAudioAndVideoRecord, simplifyMessage, transformMessage };

package/es/components/iho-table/src/plugins/filterRenderPlugin/filter.vue2.js

@@ -188,7 +188,14 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         "onUpdate:checked": _cache[1] || (_cache[1] = ($event) => isRef(partCheckAll) ? partCheckAll.value = $event : null),
         indeterminate: unref(partIndeterminate)
       }, {
-        default: withCtx(() => [createTextVNode("\u5168\u9009\u5F53\u524D")]),
+        default: withCtx(() => [createTextVNode(function() {
+          var _a, _b, _c;
+          try {
+            return ((_a = window.getLanguageByCode) == null ? void 0 : _a.call(window, "10010.1.661")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.661")) || "\u5168\u9009\u5F53\u524D";
+          } catch (e) {
+            return "\u5168\u9009\u5F53\u524D";
+          }
+        }())]),
         _: 1
       }, 8, ["checked", "indeterminate"])])) : createCommentVNode("v-if", true), createElementVNode("div", _hoisted_4, [createVNode(unref(NCheckbox), {
         checked: unref(checkAll),

package/es/shared/package.json.js

@@ -1,5 +1,5 @@
 var name = "@cnhis-design-vue/shared";
-var version = "3.3.3-beta.25";
+var version = "3.3.3-beta.27";
 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.25",
+	"version": "3.3.3-beta.27",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "80a75968acce8e9e3affb0c3bc2f53fc1e9b1725"
+	"gitHead": "370f6bf59c0deb92555455cbe230758b8d5d8135"
 }