cnhis-design-vue 3.4.0-beta.32 → 3.4.0-beta.34

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/fabric-chart/src/hooks/surgicalAnesthesia/useLeft.js

@@ -74,7 +74,7 @@ function useLeft(canvas, propItems, emits, pointTipProps, moveLimit, setPopup, u
     list.forEach((item) => {
       var _a;
       const targetList = !item.linkKey ? item.list : (_a = list.find((_item) => _item.key === item.linkKey)) == null ? void 0 : _a.list;
-      let firstPointLeft = originX;
+      let firstPointLeft = 0;
       targetList.find((k) => {
         let con = false;
         if (isEffectiveNode(k)) {
@@ -85,7 +85,7 @@ function useLeft(canvas, propItems, emits, pointTipProps, moveLimit, setPopup, u
         }
         return con;
       });
-      item.limitRight = firstPointLeft - xCellWidth;
+      item.limitRight = firstPointLeft ? firstPointLeft - xCellWidth : endX;
     });
     const externalIconList = cloneDeep(left.externalIconList || []).map((item) => ({
       ...item,
@@ -107,7 +107,7 @@ function useLeft(canvas, propItems, emits, pointTipProps, moveLimit, setPopup, u
           leftX,
           topY,
           originX: "center",
-          ...item.isExternal ? { evented: false, selectable: false } : {},
+          ...item.isExternal && { evented: false, selectable: false },
           origin: {
             linkKey: item.linkKey,
             limitRight: item.limitRight

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\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/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">\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/scale-view/src/hooks/use-event.js

@@ -13,16 +13,17 @@ const useEvent = (props, state) => {
   };
   const handleLogicList = (formItem, formArray) => {
     const { seq } = formItem;
-    let list = formArray.map((item2) => {
+    const list = formArray.map((item2) => {
       if (item2.seq > seq && item2.isShow && item2.__isLogic__)
         return item2;
       return false;
     });
     let nextItemMax = 0;
-    let i = 0, len = list.length, item;
+    const len = list.length;
+    let i = 0, item;
     for (; i < len; i++) {
       item = list[i];
-      let curVal = state.form[formKey(item)];
+      const curVal = state.form[formKey(item)];
       if (!curVal)
         continue;
       if (Array.isArray(curVal)) {
@@ -83,7 +84,7 @@ const useEvent = (props, state) => {
             });
           }
         } else if (nextLogic.next_logic == "uncondition") {
-          let res = vexutilsExpand.isEmpty(choiceValue);
+          const res = vexutilsExpand.isEmpty(choiceValue);
           formItem.__isLogic__ = !res;
           formItem.__lastSeq__ = seq + 1;
           formArray.forEach((item) => {
@@ -99,27 +100,60 @@ const useEvent = (props, state) => {
       });
     }
   };
+  const processFieldValue = (value, isNumberType) => {
+    const defaultValue = isNumberType ? null : "/";
+    if (value == null || value === "") {
+      return defaultValue;
+    }
+    if (isNumberType) {
+      if (typeof value !== "number" && isNaN(+value)) {
+        return null;
+      }
+      return +value;
+    }
+    return value;
+  };
+  const createFormElementMap = (formArray) => {
+    const elementMap = /* @__PURE__ */ new Map();
+    formArray.forEach((element) => {
+      if (element.seq != null) {
+        elementMap.set(element.seq, element);
+      }
+    });
+    return elementMap;
+  };
+  const processRelationFieldList = (dataList, relationField, isNumberType) => {
+    return dataList.map((dataItem) => processFieldValue(dataItem[relationField], isNumberType)).filter(Boolean) || [];
+  };
   const handleDynamicDataRelation = (list, formItem, formArray) => {
-    let { targetSource } = formItem;
-    if (!targetSource || !Object.keys(targetSource).length)
-      return;
-    if (!targetSource.target_id)
-      return;
-    let { relationParam = [] } = targetSource;
-    if (!relationParam.length)
+    var _a;
+    const { targetSource } = formItem;
+    if (!targetSource || !Object.keys(targetSource).length || !targetSource.target_id || !((_a = targetSource.relationParam) == null ? void 0 : _a.length)) {
       return;
-    relationParam.forEach((item) => {
-      let matchEle = formArray.find((v) => v.seq === item.relationElement);
-      const key = matchEle.val_key;
-      if (matchEle) {
-        if (!list.length) {
-          state.form[key] = "";
-        } else {
-          let relationFieldList = list.map((v) => v[item.relationField] || "/") || "";
-          state.form[key] = relationFieldList.join(",");
-        }
+    }
+    const { relationParam } = targetSource;
+    const formElementMap = createFormElementMap(formArray);
+    const len = relationParam.length;
+    let i = 0, item;
+    for (; i < len; i++) {
+      item = relationParam[i];
+      const { relationElement, relationField } = item;
+      if (relationElement == null || !relationField)
+        continue;
+      const targetElement = formElementMap.get(item.relationElement);
+      if (!targetElement)
+        continue;
+      const { val_key: formKey2, valueType } = targetElement;
+      const isNumberType = valueType === "number";
+      if (!formKey2)
+        continue;
+      if (!list.length) {
+        state.form[formKey2] = null;
+        continue;
       }
-    });
+      const relationFieldList = processRelationFieldList(list, item.relationField, isNumberType);
+      state.form[formKey2] = relationFieldList.length > 0 ? relationFieldList.join(",") : null;
+    }
   };
   return {
     nextLogicEvent,

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