cnhis-design-vue 3.3.2-beta.11 → 3.3.2-beta.12

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/audio-sdk/src/Index.vue2.js

@@ -130,7 +130,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         onEnd,
         onFail: _cache[1] || (_cache[1] = (error) => emit("fail", error)),
         onSuccess
-      }), null, 16, ["loading"])) : createCommentVNode("v-if", true), createCommentVNode(' <c-form\n				v-if="isForm"\n				:configs="configsAndBasicData.configs"\n				:data="jsonData"\n				@close="onFormClose"\n				@finish="onFinish"\n			/> ')], 64)) : (openBlock(), createBlock(RecordingModal$1, {
+      }), null, 16, ["loading"])) : createCommentVNode("v-if", true), createCommentVNode(' <c-form\r\n				v-if="isForm"\r\n				:configs="configsAndBasicData.configs"\r\n				:data="jsonData"\r\n				@close="onFormClose"\r\n				@finish="onFinish"\r\n			/> ')], 64)) : (openBlock(), createBlock(RecordingModal$1, {
         key: 1,
         content: unref(content)
       }, null, 8, ["content"]))], 4);

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/fabric-chart/src/hooks/temperature/useCenter.js

@@ -149,8 +149,12 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
         } = target.origin || {};
         if (type === "pulse") {
           const list = shadowPointCache.get(key);
-          const index = list == null ? void 0 : list.findIndex((point) => point[0] === target.left);
-          list.splice(index, 1, [target.left, target.top]);
+          const index = list == null ? void 0 : list.findIndex((point) => point.left === target.left);
+          list.splice(index, 1, {
+            ...list[index],
+            left: target.left,
+            top: target.top
+          });
         }
       }
       const data = getShadowData();
@@ -209,6 +213,12 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     const finalResult = Object.values(result).filter((item) => item.length === 2 && Math.trunc(item[0][1]) !== Math.trunc(item[1][1]));
     return finalResult;
   }
+  function getXY(point) {
+    return [point.left, point.top];
+  }
+  function getPointWidthRightLine(point) {
+    return point && !point.breakpoint ? point : null;
+  }
   function getShadowData() {
     const data = [];
     const pulsePoints = [];
@@ -217,8 +227,8 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       pulsePoints.push(item[1]);
       if (item[0] === SHADOWKEYS[0]) {
         item[1].forEach((_item) => {
-          const someIndex = (shadowPointCache.get(SHADOWKEYS[1]) || []).findIndex((v) => v[0] === _item[0]);
-          someIndex > -1 && sames.push(_item[0]);
+          const someIndex = (shadowPointCache.get(SHADOWKEYS[1]) || []).findIndex((v) => v.left === _item.left);
+          someIndex > -1 && sames.push(_item.left);
         });
       }
     }
@@ -226,28 +236,24 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     let _arr1 = [];
     let _arr2 = [];
     sames.forEach((left2) => {
-      const index1 = points1.findIndex((point) => point[0] === left2);
-      const index2 = points2.findIndex((point) => point[0] === left2);
+      const index1 = points1.findIndex((point) => point.left === left2);
+      const index2 = points2.findIndex((point) => point.left === left2);
       const currentPoint1 = points1[index1];
       const currentPoint2 = points2[index2];
-      const prevPoint1 = points1[index1 - 1];
+      const prevPoint1 = getPointWidthRightLine(points1[index1 - 1]);
       const nextPoint1 = points1[index1 + 1];
-      const prevPoint2 = points2[index2 - 1];
+      const prevPoint2 = getPointWidthRightLine(points2[index2 - 1]);
       const nextPoint2 = points2[index2 + 1];
       if (prevPoint1 && prevPoint2) {
-        if (prevPoint1[0] !== prevPoint2[0]) {
-          const maxPoint = Math.max(prevPoint1[0], prevPoint2[0]);
-          _arr1.push([prevPoint1, prevPoint2].find((point) => point[0] === maxPoint));
+        if (prevPoint1.left !== prevPoint2.left) {
+          const maxPoint = Math.max(prevPoint1.left, prevPoint2.left);
+          _arr1.push(getXY([prevPoint1, prevPoint2].find((point) => point.left === maxPoint)));
         }
       } else if (prevPoint1) {
-        _arr1.push(prevPoint1);
+        _arr1.push(getXY(prevPoint1));
       } else if (prevPoint2) {
-        _arr2.push(prevPoint2);
+        _arr2.push(getXY(prevPoint2));
       }
-      const minYPoint = Math.min(currentPoint1[1], currentPoint2[1]);
-      _arr1.push([currentPoint1, currentPoint2].find((point) => point[1] === minYPoint));
-      const maxYPoint = Math.max(currentPoint1[1], currentPoint2[1]);
-      _arr2.push([currentPoint1, currentPoint2].find((point) => point[1] === maxYPoint));
       const setData = () => {
         const dataItem = [..._arr1, ..._arr2.reverse()];
         const [firstPoint] = dataItem;
@@ -258,20 +264,29 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
         _arr1 = [];
         _arr2 = [];
       };
-      if (nextPoint1 && nextPoint2) {
-        if (nextPoint1[0] !== nextPoint2[0]) {
-          const minPoint = Math.min(nextPoint1[0], nextPoint2[0]);
-          _arr1.push([nextPoint1, nextPoint2].find((point) => point[0] === minPoint));
+      const minYPoint = Math.min(currentPoint1.top, currentPoint2.top);
+      const maxYPoint = Math.max(currentPoint1.top, currentPoint2.top);
+      _arr1.push(getXY([currentPoint1, currentPoint2].find((point) => point.top === minYPoint)));
+      _arr2.push(getXY([currentPoint1, currentPoint2].find((point) => point.top === maxYPoint)));
+      if (currentPoint1.breakpoint || currentPoint2.breakpoint) {
+        setData();
+      }
+      if (!currentPoint1.breakpoint && !currentPoint2.breakpoint) {
+        if (nextPoint1 && nextPoint2) {
+          if (nextPoint1.left !== nextPoint2.left) {
+            const minPoint = Math.min(nextPoint1.left, nextPoint2.left);
+            _arr1.push(getXY([nextPoint1, nextPoint2].find((point) => point.left === minPoint)));
+            setData();
+          }
+        } else if (nextPoint1) {
+          _arr1.push(getXY(nextPoint1));
+          setData();
+        } else if (nextPoint2) {
+          _arr2.push(getXY(nextPoint2));
+          setData();
+        } else {
           setData();
         }
-      } else if (nextPoint1) {
-        _arr1.push(nextPoint1);
-        setData();
-      } else if (nextPoint2) {
-        _arr2.push(nextPoint2);
-        setData();
-      } else {
-        setData();
       }
     });
     return data;
@@ -366,14 +381,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
     const pulseObj = yScaleValue.find((item) => item.show && item.type === "pulse");
     if (!pulseObj || !((_a = pulseObj.dataList) == null ? void 0 : _a.length))
       return;
-    if (!pulseObj.dataList.some((item) => item.title.includes(function() {
-      var _a2, _b, _c;
-      try {
-        return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.235")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.235")) || "\u8109\u640F";
-      } catch (e) {
-        return "\u8109\u640F";
-      }
-    }())))
+    if (!pulseObj.dataList.some((item) => item.key === "mai"))
       return;
     const overlap = Object.assign({}, OVERLAP, left.overlap || {});
     const points = [];
@@ -452,37 +460,10 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       } : nextV, scaleValue) : void 0;
       const nextItem = nextV ? !_isOneLine ? item : dataList.find((_v) => _v.key === nextV.key) : {};
       const {
-        title = ""
+        key = ""
       } = _item;
-      if (!(title === function() {
-        var _a2, _b, _c;
-        try {
-          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.235")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.235")) || "\u8109\u640F";
-        } catch (e) {
-          return "\u8109\u640F";
-        }
-      }() && nextItem.title !== function() {
-        var _a2, _b, _c;
-        try {
-          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.235")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.235")) || "\u8109\u640F";
-        } catch (e) {
-          return "\u8109\u640F";
-        }
-      }() || title !== function() {
-        var _a2, _b, _c;
-        try {
-          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.235")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.235")) || "\u8109\u640F";
-        } catch (e) {
-          return "\u8109\u640F";
-        }
-      }() && nextItem.title === function() {
-        var _a2, _b, _c;
-        try {
-          return ((_a2 = window.getLanguageByCode) == null ? void 0 : _a2.call(window, "10010.1.235")) || ((_c = (_b = window.top) == null ? void 0 : _b.getLanguageByCode) == null ? void 0 : _c.call(_b, "10010.1.235")) || "\u8109\u640F";
-        } catch (e) {
-          return "\u8109\u640F";
-        }
-      }()) && points && nextPoint && getFloorNumber(points[0], 1) === getFloorNumber(nextPoint[0], 1)) {
+      const mai = "mai";
+      if (!(key === mai && nextItem.key !== mai || key !== mai && nextItem.key === mai) && points && nextPoint && getFloorNumber(points[0], 1) === getFloorNumber(nextPoint[0], 1)) {
         const pointOriginX = points[0] - xCellWidth / 2;
         points[0] = pointOriginX + xCellWidth / 4;
         nextPoint[0] = nextDoublePointsX = points[0] + xCellWidth / 2;
@@ -517,7 +498,11 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
             }
             nextDoublePointsX2 = null;
           }
-          return [point.left, point.top];
+          return {
+            left: point.left,
+            top: point.top,
+            breakpoint: !point.rightLine
+          };
         });
       };
       if (_isOneLine) {
@@ -827,7 +812,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
           overlapKey,
           unit: scaleValue.unit,
           type,
-          _type: setOtherType(title, type),
+          _type: setOtherType(key, type),
           dataIndex,
           index,
           isOneLine: _isOneLine
@@ -921,7 +906,7 @@ function useCenter(canvas, propItems, emits, computedX, computedY, getXValue, ge
       x: point.left,
       y: point.top
     };
-    let timeText = `\u65F6\u95F4 ${((data == null ? void 0 : data.time) || getXValue(point.left)).slice(-5)}`;
+    let timeText = `${config.timeLabel} ${((data == null ? void 0 : data.time) || getXValue(point.left)).slice(-5)}`;
     pointTipProps.list = [getListValue(), timeText];
     pointTipProps.show = true;
     function getListValue() {

package/es/components/fabric-chart/src/hooks/temperature/useTemperatureChart.js

@@ -211,7 +211,7 @@ function useTemperatureChart(canvas, props, emits, canvasRef, pointTipProps, poi
       return item.dataList.filter((v) => v.show).map((v, dataIndex) => {
         return {
           ...v,
-          bigType: setOtherType(v.title, item.type),
+          bigType: setOtherType(v.key, item.type),
           unit: item.unit,
           dataIndex,
           isOneLine: isOneLine(item)

package/es/components/fabric-chart/src/hooks/temperature/useTop.js

@@ -111,7 +111,11 @@ function useTop(canvas, propItems) {
     const dayList = (gridXNumber - surplusCell[1] - surplusCell[3]) / grid.subSecondXCell;
     for (let i = 0; i < dayList; i++) {
       const left = originX + i * width;
-      const value = i % 2 === 0 ? "\u4E0A\u5348" : "\u4E0B\u5348";
+      const {
+        am,
+        pm
+      } = top.xScalevalue || {};
+      const value = i % 2 === 0 ? am : pm;
       const textGroup = drawTextGroup({
         width,
         height,

package/es/components/fabric-chart/src/utils/index.d.ts

@@ -9,7 +9,7 @@ export declare function deleteProperty(data: AnyObject, list: AnyObject[]): {};
  */
 export declare function isOneLine(scaleItem: AnyObject): any;
 export declare function getIndex(time: string, list: AnyObject[], isEqual?: boolean): number;
-export declare function setOtherType(title: string, type: string): string;
+export declare function setOtherType(key: string, type: string): string;
 export declare function getType(type: string): string;
 export declare function isValidValue(value: number | string): boolean;
 export declare function isOverlapPoint(pointObj1: any, pointObj2: any): boolean;

package/es/components/fabric-chart/src/utils/index.js

@@ -23,8 +23,8 @@ function getIndex(time, list, isEqual = false) {
   });
   return !~index ? list.length : index;
 }
-function setOtherType(title, type) {
-  return title.includes("\u5FC3\u7387") ? "pulse_other" : type;
+function setOtherType(key, type) {
+  return key === "xinmai" ? "pulse_other" : type;
 }
 function getType(type) {
   return type.includes("_other") ? type.split("_")[0] : type;

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/scale-view/src/ScaleView.vue2.js

@@ -193,7 +193,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         }]),
         ref_key: "scaleViewDom",
         ref: scaleViewDom
-      }, [createCommentVNode(' <template v-if="state.spinning">\n      <n-spin :show="state.spinning" description="\u52A0\u8F7D\u4E2D"></n-spin>\n    </template> '), !state.spinning && !state.hasFrontAddress ? (openBlock(), createElementBlock(Fragment, {
+      }, [createCommentVNode(' <template v-if="state.spinning">\r\n      <n-spin :show="state.spinning" description="\u52A0\u8F7D\u4E2D"></n-spin>\r\n    </template> '), !state.spinning && !state.hasFrontAddress ? (openBlock(), createElementBlock(Fragment, {
         key: 0
       }, [unref(noDataState).noData ? (openBlock(), createBlock(NoData, {
         key: 0,

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.2-beta.11";
+var version = "3.3.2-beta.12";
 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.2-beta.11",
+	"version": "3.3.2-beta.12",
 	"license": "ISC",
 	"module": "./es/components/index.js",
 	"main": "./es/components/index.js",
@@ -72,5 +72,5 @@
 		"iOS 7",
 		"last 3 iOS versions"
 	],
-	"gitHead": "2419ed3d84a20ae25ec20123e04f16e466970534"
+	"gitHead": "633b4fda9850c2c6483402c73379feb3038712d4"
 }