cnhis-design-vue 3.1.34-beta.16 → 3.1.34-beta.18

package/README.md

@@ -1,123 +1,123 @@
-# 安装
-
-```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. 注意
-
-由于 vxe-table 目前的引入方式是由组件 install 触发的,所以如果需要使用 c-grid/c-big-table 组件,需要全局注册二者任意一个
-
-```typescript
-// main.ts
-import { createApp } from 'vue';
-import App from './App.vue';
-
-import { CGrid } from 'cnhis-design-vue';
-// 或者
-import { CBigTable } from 'cnhis-design-vue';
-
-const app = createApp(App);
-app.use(CGrid);
-// 或者
-app.use(CBigTable);
-app.mount('#app');
-```
-
-## 4.FAQ
-
-### 4.1 项目打包后样式丢失
-
-> 处理方法, 将 cnhis-design-vue 从 vendor 包中移除
-
-```typescript
-// vite.config.ts
-import { defineConfig } from 'vite';
-
-export default defineConfig({
-  rollupOptions: {
-    // ..otherOptions
-    output: {
-      dir: './dist',
-      manualChunks(id: string) {
-        if (id.includes('node_modules') && !id.includes('cnhis-design-vue')) {
-          return 'vendor';
-        }
-      }
-    }
-  }
-});
-```
-
-### 4.2 找不到文件
-
-> 由于组件库输出文件类型由 js 修改成了 mjs, 如果配置了 resolve 属性的项目, 需要将 mjs 文件类型添加至 extensions 中
-
-```javascript
-// vite.config.ts
-const config = {
-  // ...otherOptions
-  resolve: {
-    // ...otherOptions
-    // 如果没有配置, 则不用考虑
-    extensions: ['.js', '.ts', '.vue', '.json', '.mjs']
-  }
-};
-```
+# 安装
+
+```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. 注意
+
+由于 vxe-table 目前的引入方式是由组件 install 触发的,所以如果需要使用 c-grid/c-big-table 组件,需要全局注册二者任意一个
+
+```typescript
+// main.ts
+import { createApp } from 'vue';
+import App from './App.vue';
+
+import { CGrid } from 'cnhis-design-vue';
+// 或者
+import { CBigTable } from 'cnhis-design-vue';
+
+const app = createApp(App);
+app.use(CGrid);
+// 或者
+app.use(CBigTable);
+app.mount('#app');
+```
+
+## 4.FAQ
+
+### 4.1 项目打包后样式丢失
+
+> 处理方法, 将 cnhis-design-vue 从 vendor 包中移除
+
+```typescript
+// vite.config.ts
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+  rollupOptions: {
+    // ..otherOptions
+    output: {
+      dir: './dist',
+      manualChunks(id: string) {
+        if (id.includes('node_modules') && !id.includes('cnhis-design-vue')) {
+          return 'vendor';
+        }
+      }
+    }
+  }
+});
+```
+
+### 4.2 找不到文件
+
+> 由于组件库输出文件类型由 js 修改成了 mjs, 如果配置了 resolve 属性的项目, 需要将 mjs 文件类型添加至 extensions 中
+
+```javascript
+// vite.config.ts
+const config = {
+  // ...otherOptions
+  resolve: {
+    // ...otherOptions
+    // 如果没有配置, 则不用考虑
+    extensions: ['.js', '.ts', '.vue', '.json', '.mjs']
+  }
+};
+```

package/es/components/fabric-chart/src/hooks/useCenter.js

@@ -4,7 +4,7 @@ import useGrid from './useGrid.js';
 import { useShadow } from './useShadow.js';
 import { TEMPERATURE_MENU, PAIN_MENU, OVERLAP } from './constant.js';
 import { cloneDeep } from 'lodash-es';
-import { isEffectiveNode, getIndex, deleteProperty } from '../utils/utils.js';
+import { isOneLine, isEffectiveNode, getIndex, deleteProperty } from '../utils/utils.js';
 
 function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, addRenderItem, pointTipProps, pointMenuProps, useCommon) {
   useGrid(canvas, propItems);
@@ -50,9 +50,6 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     drawOverlapPoint();
     setCanvasEvent();
   }
-  function isOneLine(type) {
-    return ["temperature", "pulse"].includes(type);
-  }
   function drawPositionLine(scaleValue) {
     if (scaleValue.type !== "temperature" || !scaleValue.positionLine)
       return;
@@ -78,78 +75,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         }
       }
       console.log("shadowPointCache :>> ", shadowPointCache);
-      const data = [];
-      const _shadowPointCache = [];
-      const somes = [];
-      for (const item of shadowPointCache) {
-        _shadowPointCache.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 && somes.push(_item[0]);
-          });
-        }
-      }
-      const [points1, points2] = _shadowPointCache;
-      console.log("points1, points2 :>> ", points1, points2);
-      let _arr1 = [];
-      let _arr2 = [];
-      somes.forEach((x, i) => {
-        const index1 = points1.findIndex((point) => point[0] === x);
-        const index2 = points2.findIndex((point) => point[0] === x);
-        const currentPoint1 = points1[index1];
-        const currentPoint2 = points2[index2];
-        const prevPoint1 = points1[index1 - 1];
-        const nextPoint1 = points1[index1 + 1];
-        const prevPoint2 = 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));
-          } else {
-            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));
-          }
-        } else if (prevPoint1) {
-          _arr1.push(prevPoint1);
-        } else if (prevPoint2) {
-          _arr2.push(prevPoint2);
-        } else {
-          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;
-          const lastPoint = dataItem.at(-1);
-          if (firstPoint[0] === lastPoint[0] && firstPoint[1] === lastPoint[1])
-            dataItem.splice(-1, 1);
-          data.push(dataItem);
-          _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));
-            setData();
-          }
-        } else if (nextPoint1) {
-          _arr1.push(nextPoint1);
-          setData();
-        } else if (nextPoint2) {
-          _arr2.push(nextPoint2);
-          setData();
-        } else {
-          setData();
-        }
-      });
-      console.log(data, somes);
+      const data = getShadowData();
       data.forEach((item) => {
         var _a2, _b, _c, _d, _e, _f;
         const points = item.map((v) => ({ x: v[0], y: v[1] }));
@@ -178,6 +104,73 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       });
     }
   }
+  function getShadowData() {
+    const data = [];
+    const _shadowPointCache = [];
+    const somes = [];
+    for (const item of shadowPointCache) {
+      _shadowPointCache.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 && somes.push(_item[0]);
+        });
+      }
+    }
+    const [points1, points2] = _shadowPointCache;
+    let _arr1 = [];
+    let _arr2 = [];
+    somes.forEach((left2) => {
+      const index1 = points1.findIndex((point) => point[0] === left2);
+      const index2 = points2.findIndex((point) => point[0] === left2);
+      const currentPoint1 = points1[index1];
+      const currentPoint2 = points2[index2];
+      const prevPoint1 = points1[index1 - 1];
+      const nextPoint1 = points1[index1 + 1];
+      const prevPoint2 = 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));
+        }
+      } else if (prevPoint1) {
+        _arr1.push(prevPoint1);
+      } else if (prevPoint2) {
+        _arr2.push(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;
+        const lastPoint = dataItem.at(-1);
+        if (firstPoint[0] === lastPoint[0] && firstPoint[1] === lastPoint[1])
+          dataItem.splice(-1, 1);
+        data.push(dataItem);
+        _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));
+          setData();
+        }
+      } else if (nextPoint1) {
+        _arr1.push(nextPoint1);
+        setData();
+      } else if (nextPoint2) {
+        _arr2.push(nextPoint2);
+        setData();
+      } else {
+        setData();
+      }
+    });
+    return data;
+  }
   function setCanvasEvent() {
     if (!propItems.event.evented)
       return;
@@ -650,7 +643,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         data: {
           time: getXValue(item.pointer.x),
           value: getYValue(item.origin.type, item.pointer.y),
-          ...item.origin.type !== "temperature" ? {} : { key: item.origin.key }
+          ...!isOneLine(item.origin.type) ? {} : { key: item.origin.key }
         },
         ...item.origin
       };
@@ -661,7 +654,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       deleteProperty(data, TEMPERATURE_MENU);
       deleteProperty(data, PAIN_MENU);
       data[`${item.type}`] = item.value;
-      if (type === "temperature") {
+      if (isOneLine(type)) {
         data["key"] = target.origin.key;
       }
       const params = {
@@ -676,7 +669,7 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
     const { type, dataIndex, index, data, key } = params;
     const obj = yScaleValue.find((v) => v.type === type);
     if (mode === "add") {
-      const dataList = type !== "temperature" ? obj.dataList[dataIndex] : obj.dataList.find((v) => v.enable);
+      const dataList = !isOneLine(type) ? obj.dataList[dataIndex] : obj.dataList.find((v) => v.enable);
       const index2 = getIndex(data.time, dataList.list);
       dataList.list.splice(index2, 0, data);
     } else {

package/es/components/fabric-chart/src/hooks/useLeft.js

@@ -1,5 +1,6 @@
 import { fabric } from '../utils/index.js';
 import { defaultBorderStyle, defaultTextStyle, defaultStyle, defaultRectStyle, drawPoint, drawTextGroup } from './useDraw.js';
+import { isOneLine } from '../utils/utils.js';
 
 function useLeft(canvas, propItems, emits, setPopup, pointTipProps, cumputedX, cumputedY, getXValue, getYValue, isAddPoint, updateData, useCommon) {
   var _a, _b;
@@ -282,7 +283,7 @@ function useLeft(canvas, propItems, emits, setPopup, pointTipProps, cumputedX, c
               data: {
                 time: getXValue(point.left),
                 value: getYValue(point.origin.type, point.top),
-                ...point.origin.type !== "temperature" ? {} : { key: point.origin.key }
+                ...!isOneLine(point.origin.type) ? {} : { key: point.origin.key }
               },
               ...point.origin
             };

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

@@ -3,3 +3,9 @@ import { AnyObject } from '../../../../../es/shared/types';
 export declare function isEffectiveNode(node: IPoint): string | number | boolean;
 export declare function deleteProperty(data: AnyObject, list: AnyObject[]): void;
 export declare function getIndex(time: string, list: AnyObject[]): number;
+/**
+ * @description: 判断yScaleValue数组内的项类型是否可以连成一条折线，比如温度线
+ * @param {string} type
+ * @return {*}
+ */
+export declare function isOneLine(type: string): boolean;

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

@@ -11,5 +11,8 @@ function getIndex(time, list) {
   const index = list.findIndex((v) => new Date(v.time).getTime() > new Date(time).getTime());
   return !~index ? list.length : index;
 }
+function isOneLine(type) {
+  return ["temperature", "pulse"].includes(type);
+}
 
-export { deleteProperty, getIndex, isEffectiveNode };
+export { deleteProperty, getIndex, isEffectiveNode, isOneLine };

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/selectRendererPlugin/index.js

@@ -1,4 +1,6 @@
 import { createVNode, mergeProps } from 'vue';
+import { findAncestor } from '../../../../../../../shared/utils/index.js';
+import { isObject } from 'lodash-es';
 import '../../../../../index.js';
 import { EDITABLE_WIDGET_TYPE } from '../../../../constants/index.js';
 import { IhoTableRenderHelper } from '../../../../utils/index.js';
@@ -8,9 +10,24 @@ import { defineTablePlugin } from '../../../../hooks/useTablePlugin.js';
 
 function selectRendererPlugin() {
   const pluginName = "selectRendererPlugin";
+  function isHTMLElement(target) {
+    return isObject(target);
+  }
   return defineTablePlugin({
     name: pluginName,
     vxe(instance) {
+      instance.interceptor.add("event.clearActived", ({
+        $event,
+        column
+      }) => {
+        var _a;
+        if (((_a = column.editRender) == null ? void 0 : _a.name) !== EDITABLE_WIDGET_TYPE.SELECT)
+          return true;
+        const target = $event == null ? void 0 : $event.target;
+        if (!isHTMLElement(target))
+          return true;
+        return !findAncestor(target, (ele) => ele.classList.contains("n-base-select-menu-option-wrapper"));
+      });
       instance.renderer.add(EDITABLE_WIDGET_TYPE.SELECT, {
         renderCell({
           props

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/selectRendererPlugin/selectUtils.js

@@ -1,19 +1,15 @@
 function getDefaultValue(row, item) {
-  var _a;
   const value = row[item.columnName];
   if (Array.isArray(value))
-    return (_a = value.map((v) => getValue(v))) == null ? void 0 : _a.join(",");
+    return value.map((v) => getValue(v)).join(",");
   return getValue(value);
   function getValue(value2) {
-    var _a2, _b;
+    var _a;
     const findValue = (options) => {
-      var _a3;
-      return ((_a3 = options == null ? void 0 : options.find((v) => v.value == value2)) == null ? void 0 : _a3.label) || value2 || "";
+      var _a2;
+      return ((_a2 = options == null ? void 0 : options.find((v) => v.value == value2)) == null ? void 0 : _a2.label) || value2 || "";
     };
-    if (item.formatMap) {
-      return row[(_a2 = item.formatMap) == null ? void 0 : _a2.label];
-    }
-    return findValue(((_b = item.componentProps) == null ? void 0 : _b.options) || []);
+    return findValue(((_a = item.componentProps) == null ? void 0 : _a.options) || []);
   }
 }