cnhis-design-vue 3.4.0-beta.13 → 3.4.0-beta.15

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/utils/print.d.ts

@@ -70,6 +70,7 @@ export declare class Print {
     _base64ToBlob(fileBase64: string, fileType: string): Blob;
     preview({ iReportExecuteMode, hideButtons, templateId, number, formatId: originFormatId, formatItem, params, paramsArr, authorizationKey, signature, btnprint, messageTimeout }: AnyObject, successCallbackFn?: AnyFn, errorCallbackFn?: AnyFn): Promise<any>;
     printSync(data: AnyObject[], successCallbackFn: AnyFn, errorCallbackFn: AnyFn): Promise<void>;
+    isObject(o: any): boolean;
     printDirect({ iReportExecuteMode, templateId, number, formatId: originFormatId, formatItem, params, paramsArr, authorizationKey, print, signature, printdlgshow, nobillnode, copies, svrUpdateIp, apptype, uuid, printname, priority, isShowQueueProgressNotify, isDownloadFile, messageTimeout }: AnyObject, successCallbackFn: AnyFn, errorCallbackFn: AnyFn, cancelCallbackFn?: AnyFn, printQueueCallbackFn?: AnyFn, mode?: string): Promise<false | undefined>;
     printToHiPrint({ templateId, formatId, params, authorizationKey }: any, successCallbackFn: AnyFn, errorCallbackFn: AnyFn, cancelCallbackFn?: AnyFn): Promise<any>;
     private _downloadPDF;

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

@@ -308,11 +308,10 @@ class Print {
   }
   async getPicAndUpload(obj) {
     try {
-      const isObject = (o) => Object.prototype.toString.call(o) === "[object Object]";
       if ((obj == null ? void 0 : obj.result) === "success" && (obj == null ? void 0 : obj.uploadTemplateFlag) == "Y" && !(obj == null ? void 0 : obj.filebase64) && this.queryServicesParams) {
-        const params = isObject(this.queryServicesParams.params) ? this.queryServicesParams.params : JSON.parse(this.queryServicesParams.params);
+        const params = this.isObject(this.queryServicesParams.params) ? this.queryServicesParams.params : JSON.parse(this.queryServicesParams.params);
         params.uploadTemplateFlag = "Y";
-        this.queryServicesParams.params = JSON.stringify(params);
+        this.queryServicesParams.params = params;
         this.queryServicesParams.cmdid = PRINT_CMD_ID;
         this.queryServicesParams.print = {
           print: 1,
@@ -320,7 +319,7 @@ class Print {
           zip: 0
         };
         this.queryServicesParams.paramsArr = [{
-          params: JSON.stringify(params)
+          params
         }];
         const data = await this._queryBase64ServicesPrint(this.queryServicesParams);
       }
@@ -991,6 +990,9 @@ class Print {
       this._handleMonitorNotify(error);
     }
   }
+  isObject(o) {
+    return Object.prototype.toString.call(o) === "[object Object]";
+  }
   async printDirect({
     iReportExecuteMode,
     templateId,
@@ -1014,7 +1016,7 @@ class Print {
     isDownloadFile = true,
     messageTimeout = 0
   }, successCallbackFn, errorCallbackFn, cancelCallbackFn, printQueueCallbackFn, mode = "printDirect") {
-    const isObject = (o) => Object.prototype.toString.call(o) === "[object Object]";
+    params = this.isObject(params) || !params ? params : JSON.parse(params);
     const iReportStatus = isIReport(originFormatId);
     const formatId = this.getIReportFormatId(iReportStatus, originFormatId);
     if (iReportStatus && (isDomestic || iReportExecuteMode == 2)) {
@@ -1059,7 +1061,7 @@ class Print {
       return false;
     try {
       if (formatItem == null ? void 0 : formatItem.queuePrint) {
-        const printParams = isObject(params) ? cloneDeep(params) : params;
+        const printParams = this.isObject(params) ? cloneDeep(params) : params;
         paramsArr = [{
           params: printParams
         }];

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

@@ -553,9 +553,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: 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

@@ -594,9 +594,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: 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

@@ -773,9 +773,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: 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<import("vue").ExtractPropT
         hide: 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

@@ -601,7 +601,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }, {
           default: withCtx(() => [!unref(isAudioOrVideoMessage)(item.content) ? (openBlock(), createElementBlock(Fragment, {
             key: 0
-          }, [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), {
+          }, [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), {
             quaternary: "",
             size: "tiny",
             onClick: () => setReferenceMsg(item)

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/select-person/src/SelectPerson.vue2.js

@@ -610,7 +610,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       checkedAll.value = isSearch.value = false;
       checkedKeys.value = [];
       expandedKeys.value = [];
-      treeData.value = treeAsyncData.value = [];
+      treeData.value = [];
+      treeAsyncData.value = [];
     }
     watch(() => props.data, (value) => {
       resetParams();

package/es/components/select-person/src/utils/index.js

@@ -19,8 +19,8 @@ function searchFilterTree(attr, data, keyword, filterKey) {
   return searchBasisTree(data, keyword, filterKey);
 }
 function searchBasisTree(data, keyword, filterKey) {
-  transform(data, keyword, filterKey);
-  return filterHandle(data);
+  const searchItems = transform(data, keyword, filterKey);
+  return filterHandle(searchItems);
 }
 function getAllChildren(children, childrenKey) {
   const cache = /* @__PURE__ */ new WeakMap();
@@ -46,20 +46,22 @@ function getAllChildren(children, childrenKey) {
   return Array.from(childrenIterator(children || []));
 }
 function transform(data, keyword, filterKey) {
-  data.forEach((item) => {
+  return data.map((item) => {
     var _a;
+    const tree = { ...item };
     const filterValue = item[filterKey] ? item[filterKey].split(",") : [item.title || item.name];
-    item.visible = filterValue.some((item2) => item2.includes(keyword.trim()));
+    tree.visible = filterValue.some((item2) => item2.includes(keyword.trim()));
     if ((_a = item.children) == null ? void 0 : _a.length) {
-      transform(item.children, keyword, filterKey);
-      if (item.visible) {
-        setVisible(item.children);
+      tree.children = transform(item.children, keyword, filterKey);
+      if (tree.visible) {
+        setVisible(tree.children);
       } else {
-        const isVisible = item.children.some((child) => child.visible);
+        const isVisible = tree.children.some((child) => child.visible);
         if (isVisible)
-          item.visible = true;
+          tree.visible = true;
       }
     }
+    return tree;
   });
 }
 function getStaffByName(data, keyword, filterKey) {

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.4.0-beta.13";
+var version = "3.4.0-beta.15";
 var main = "index.ts";
 var peerDependencies = {
 	"naive-ui": "^2.30.0",

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cnhis-design-vue",
-	"version": "3.4.0-beta.13",
+	"version": "3.4.0-beta.15",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "c01fe58ff9e6c3986b3a5aeddf066f8b0501944d"
+	"gitHead": "5550a536343c49dce585e0cff932473410fafacc"
 }