cnhis-design-vue 3.3.3-beta.21 → 3.3.3-beta.23

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/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

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

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

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

@@ -2281,6 +2281,7 @@ declare const IhoChat: SFCWithInstall<import("vue").DefineComponent<{
         HappyOutline: 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<{}>>, {}>;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     ChatFooter: import("vue").DefineComponent<{}, {
+        SPACE_PLACEHOLDER: string;
         inputRef: import("vue").Ref<HTMLDivElement | undefined>;
         state: {
             orgId: string | number;
@@ -2338,9 +2339,11 @@ declare const IhoChat: SFCWithInstall<import("vue").DefineComponent<{
         isWrap: (event: KeyboardEvent) => boolean;
         handleInput: () => void;
         selectEmoji: (name: string) => void;
+        insertSpace: () => void;
         doUpdateFile: (file: File) => Promise<string>;
         fileChange: (options: import("./src/types").FileOptions, chatMessageType: import("./src/constants").MESSAGE_TYPE) => Promise<void>;
         handleMsgSend: () => Promise<void>;
+        removeSpace: () => void;
         doSendMessage: (contentInfo: import("../../shared/types").AnyObject) => Promise<void>;
         clearInput: () => void;
         handleRelay: ({ checkedIds, remark }: {

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

@@ -2282,6 +2282,7 @@ declare const _default: import("vue").DefineComponent<{
         HappyOutline: 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<{}>>, {}>;
     }, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{}>>, {}>;
     ChatFooter: import("vue").DefineComponent<{}, {
+        SPACE_PLACEHOLDER: string;
         inputRef: import("vue").Ref<HTMLDivElement | undefined>;
         state: {
             orgId: string | number;
@@ -2339,9 +2340,11 @@ declare const _default: import("vue").DefineComponent<{
         isWrap: (event: KeyboardEvent) => boolean;
         handleInput: () => void;
         selectEmoji: (name: string) => void;
+        insertSpace: () => void;
         doUpdateFile: (file: File) => Promise<string>;
         fileChange: (options: import("./types").FileOptions, chatMessageType: import("./constants").MESSAGE_TYPE) => Promise<void>;
         handleMsgSend: () => Promise<void>;
+        removeSpace: () => void;
         doSendMessage: (contentInfo: AnyObject) => Promise<void>;
         clearInput: () => void;
         handleRelay: ({ checkedIds, remark }: {

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

@@ -4,6 +4,7 @@ import { MESSAGE_TYPE } from '../constants';
 import { simplifyMessage } from '../utils';
 import { FileOptions } from '../types';
 declare const _default: import("vue").DefineComponent<{}, {
+    SPACE_PLACEHOLDER: string;
     inputRef: Ref<HTMLDivElement | undefined>;
     state: {
         orgId: string | number;
@@ -61,9 +62,11 @@ declare const _default: import("vue").DefineComponent<{}, {
     isWrap: (event: KeyboardEvent) => boolean;
     handleInput: () => void;
     selectEmoji: (name: string) => void;
+    insertSpace: () => void;
     doUpdateFile: (file: File) => Promise<string>;
     fileChange: (options: FileOptions, chatMessageType: MESSAGE_TYPE) => Promise<void>;
     handleMsgSend: () => Promise<void>;
+    removeSpace: () => void;
     doSendMessage: (contentInfo: AnyObject) => Promise<void>;
     clearInput: () => void;
     handleRelay: ({ checkedIds, remark }: {

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

@@ -1,4 +1,4 @@
-import { createElementVNode, defineComponent, ref, computed, watch, withDirectives, openBlock, createElementBlock, normalizeStyle, unref, createVNode, withCtx, Fragment, toDisplayString, createCommentVNode, renderList, createBlock, createTextVNode, mergeProps, renderSlot, vShow } from 'vue';
+import { createElementVNode, defineComponent, ref, computed, onMounted, watch, withDirectives, openBlock, createElementBlock, normalizeStyle, unref, createVNode, withCtx, Fragment, toDisplayString, createCommentVNode, renderList, createBlock, createTextVNode, mergeProps, renderSlot, vShow } from 'vue';
 import { NButton, NIcon, NTooltip, NPopover, NUpload, NUploadTrigger } from 'naive-ui';
 import ChatAdd from './ChatAdd.vue.js';
 import { useData } from '../hooks/useData.js';
@@ -92,6 +92,7 @@ const _hoisted_24 = /* @__PURE__ */ createElementVNode("span", {
 var _sfc_main = /* @__PURE__ */ defineComponent({
   __name: "ChatFooter",
   setup(__props) {
+    const SPACE_PLACEHOLDER = '<span style="display: inline-block;width: 1px;user-select: none;" data-space="true"></span>';
     const inputRef = ref();
     const {
       state,
@@ -109,7 +110,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         defaultValue: [state.userInfo]
       };
     });
-    const sendBtnDisabled = computed(() => !content.value.replace(/(&nbsp;|\s|<br>)+/g, ""));
+    const sendBtnDisabled = computed(() => !content.value.replace(/(&nbsp;|\s|<br>|<span[^>]*data-space="true"[^>]*>[\s\S]*?<\/span>)+/g, ""));
     const isForwardDisabled = computed(() => !state.msgList.some((msgItem) => msgItem.checked));
     const callBtnDisabled = computed(() => state.showVideo || state.showMultipleVideo);
     function handleCall(chatMessageType, checkedIds = []) {
@@ -154,15 +155,29 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function handleInput() {
       var _a;
+      if (!inputRef.value)
+        return;
       content.value = ((_a = inputRef.value) == null ? void 0 : _a.innerHTML) || "";
+      insertSpace();
     }
     function selectEmoji(name) {
       var _a;
       commonEmoticons.value.unshift(name);
       commonEmoticons.value = uniq(commonEmoticons.value).slice(0, 26);
+      if (!inputRef.value)
+        return;
       (_a = inputRef.value) == null ? void 0 : _a.focus();
+      insertSpace();
       document.execCommand("insertHTML", false, `<img data-msg=${name} data-type=${MESSAGE_TYPE.EMOJI} class="emoji--min" src=${emojis.findEmoji(name)} />`);
     }
+    function insertSpace() {
+      if (!inputRef.value)
+        return;
+      if (!inputRef.value.innerHTML || inputRef.value.innerHTML === "<br>") {
+        Array.from(inputRef.value.childNodes).forEach((child) => child.remove());
+        document.execCommand("insertHTML", false, SPACE_PLACEHOLDER);
+      }
+    }
     async function doUpdateFile(file) {
       const formData = new FormData();
       formData.append("sender", state.userInfo.id);
@@ -191,13 +206,14 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       });
     }
     async function handleMsgSend() {
+      if (sendBtnDisabled.value)
+        return console.log("\u8BF7\u8F93\u5165\u5185\u5BB9");
+      removeSpace();
       const {
         innerHTML = "",
         innerText = "",
         outerText = ""
       } = inputRef.value || {};
-      if (sendBtnDisabled.value)
-        return console.log("\u8BF7\u8F93\u5165\u5185\u5BB9");
       let chatMessageType = MESSAGE_TYPE.TEXT;
       let msg = "";
       if (innerHTML) {
@@ -259,6 +275,12 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         origin: "btn"
       });
     }
+    function removeSpace() {
+      if (!inputRef.value)
+        return;
+      const spaceHolders = inputRef.value.querySelectorAll('[data-space="true"]');
+      spaceHolders.forEach((space) => space.remove());
+    }
     async function doSendMessage(contentInfo) {
       const {
         chatMessageType = MESSAGE_TYPE.TEXT,
@@ -288,7 +310,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     }
     function clearInput() {
       if (inputRef.value) {
-        inputRef.value.innerHTML = "";
+        inputRef.value.innerHTML = SPACE_PLACEHOLDER;
       }
       content.value = "";
     }
@@ -323,6 +345,11 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       });
       state.isForward = false;
     }
+    onMounted(() => {
+      if (inputRef.value) {
+        inputRef.value.innerHTML = SPACE_PLACEHOLDER;
+      }
+    });
     watch(() => [state.currentReferenceMsg, state.currentReEditMsg], ([currentReferenceMsg, currentReEditMsg]) => {
       var _a;
       if (currentReferenceMsg || currentReEditMsg) {

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

@@ -1,6 +1,6 @@
 import { defineComponent, inject, ref, shallowRef, computed, watch, openBlock, createBlock, unref, withCtx, createVNode, createElementVNode, normalizeStyle, createCommentVNode, renderSlot, withKeys, createTextVNode, toDisplayString, withDirectives, vShow, createElementBlock, mergeProps, Fragment, renderList, normalizeProps, guardReactiveProps } from 'vue';
 import { useMessage, NGrid, NGi, NInputGroup, NInput, NButton, NCheckbox, NTree, NSpace, NPopover } from 'naive-ui';
-import { getAllChildren, searchBasisTree } from './utils/index.js';
+import { getAllChildren, searchBasisTree, getExpandedKeys } from './utils/index.js';
 import { union, remove } from 'lodash-es';
 import SearchGroupList from './components/SearchGroupList.vue.js';
 import TagItem from './components/TagItem.vue.js';
@@ -379,6 +379,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           const filterKey2 = (_d = (_c = props == null ? void 0 : props.wordbook) == null ? void 0 : _c.filter_key) != null ? _d : "keyword";
           const data = searchBasisTree(treeData.value, kw, filterKey2);
           searchTreeData.value = data;
+          expandedKeys.value = searchTreeData.value.length ? getExpandedKeys(searchTreeData.value) : [];
           return;
         }
         const flatResult = flatFilter(treeData.value);

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.21";
+var version = "3.3.3-beta.23";
 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.21",
+	"version": "3.3.3-beta.23",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -73,5 +73,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "62947fabfe219622c1eb353888cee515f64595c5"
+	"gitHead": "8e2c9c3977ae65cf55bdeacd06f6be538f72b521"
 }