cnhis-design-vue 3.4.0-beta.66 → 3.4.0-beta.68

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/field-set/src/FieldColor.vue.d.ts

@@ -553,12 +553,12 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        fieldDescribeMode: "column" | "tooltip";
-        isFieldSet: boolean;
-        hideExpressionOption: AnyObject[];
+        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
-        isHighlightRow: boolean;
+        isFieldSet: boolean;
+        fieldDescribeMode: "column" | "tooltip";
+        hideExpressionOption: AnyObject[];
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
     EditDialog: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
         visible: {

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

@@ -594,12 +594,12 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        fieldDescribeMode: "column" | "tooltip";
-        isFieldSet: boolean;
-        hideExpressionOption: AnyObject[];
+        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
-        isHighlightRow: boolean;
+        isFieldSet: boolean;
+        fieldDescribeMode: "column" | "tooltip";
+        hideExpressionOption: AnyObject[];
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
     readonly setStyle: typeof setStyle;
 }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, ("close" | "save" | "reset")[], "close" | "save" | "reset", import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{

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

@@ -773,12 +773,12 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
             hide: boolean;
         }>;
         draggable: boolean;
-        fieldDescribeMode: "column" | "tooltip";
-        isFieldSet: boolean;
-        hideExpressionOption: AnyObject[];
+        isHighlightRow: boolean;
         idx: number;
         isHighlight: boolean;
-        isHighlightRow: boolean;
+        isFieldSet: boolean;
+        fieldDescribeMode: "column" | "tooltip";
+        hideExpressionOption: AnyObject[];
     }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
     readonly isArray: {
         (value?: any): value is any[];
@@ -918,9 +918,9 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
     showSeq: boolean;
     developMode: boolean;
     footerFlag: boolean;
+    fieldDescribeMode: "column" | "tooltip";
     customColumns: FieldSetColumnItem[];
     showSortPriority: boolean;
     showHeadFilter: boolean;
-    fieldDescribeMode: "column" | "tooltip";
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

package/es/components/field-set/src/FieldSet.vue2.js

@@ -274,8 +274,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       var _a2, _b;
       if (!((_a2 = props.showColumnNames) == null ? void 0 : _a2.length)) {
         const isEdit = ["editable", "required"].includes(column.field);
-        if (isEdit && !props.isEdit || column.field === "sortPriority" && !props.showSortPriority || column.field === "isShowHeaderFilter" && !props.showHeadFilter || column.field === "hideExpression" && !((_b = props.hideExpressionConfig) == null ? void 0 : _b.show))
+        if (isEdit && !props.isEdit || column.field === "sortPriority" && !props.showSortPriority || column.field === "isShowHeaderFilter" && !props.showHeadFilter)
           return false;
+        if (column.field === "hideExpression" && !!((_b = props.hideExpressionConfig) == null ? void 0 : _b.show))
+          return true;
         return !column.hide;
       }
       return true;

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

@@ -384,11 +384,11 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         hide: boolean;
     }>;
     draggable: boolean;
-    fieldDescribeMode: "column" | "tooltip";
-    isFieldSet: boolean;
-    hideExpressionOption: AnyObject[];
+    isHighlightRow: boolean;
     idx: number;
     isHighlight: boolean;
-    isHighlightRow: boolean;
+    isFieldSet: boolean;
+    fieldDescribeMode: "column" | "tooltip";
+    hideExpressionOption: AnyObject[];
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

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

@@ -147,7 +147,16 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         return treeMap.get(key);
       }).filter((tag) => !props.uncheckableField || props.uncheckableField && !tag.originItem[props.uncheckableField]);
       if (isRemote.value) {
-        return [...remoteDefaultList.value, ...re];
+        const mergeTags = [...remoteDefaultList.value, ...re];
+        const seen = /* @__PURE__ */ new Set();
+        const unique = mergeTags.filter((item) => {
+          const k = item.key;
+          if (seen.has(k))
+            return false;
+          seen.add(k);
+          return true;
+        });
+        return unique;
       }
       return re;
     });
@@ -186,6 +195,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
             label: tag.name
           };
         });
+        checkedKeys.value = props.defaultList.map((v) => v.key).filter((key) => treeMap.has(key));
+        return;
       }
       checkedKeys.value = props.defaultList.filter((k) => treeMap.has(k));
     }
@@ -213,6 +224,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           });
           curNode.children = tempData.treeItems;
         }
+        const defaultKeys = props.defaultList.map((v) => v.key).filter((key) => treeMap.has(key));
+        if (defaultKeys == null ? void 0 : defaultKeys.length) {
+          checkedKeys.value = [.../* @__PURE__ */ new Set([...checkedKeys.value, ...defaultKeys])];
+        }
         return curNode;
       }
       return node;

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.66";
+var version = "3.4.0-beta.68";
 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.66",
+	"version": "3.4.0-beta.68",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "ebc0b457ddea06a2b1a8abe4234e5c077782291f"
+	"gitHead": "ddc81dfa5795891aea5b87fa25bf69b1d0a98c68"
 }