cnhis-design-vue 3.1.23-beta.1 → 3.1.23-beta.12

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/big-table/index.d.ts

@@ -643,9 +643,6 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         userInfo: Record<string, any>;
         sysImageSize: unknown[];
     }>;
-    handleSeqConfig: import("vue").ComputedRef<{
-        startIndex: number;
-    }>;
     treeConfig: import("vue").ComputedRef<null>;
     hideAllWrap: (e: any) => void;
     bindDocumentClick: () => void;

package/es/components/big-table/src/BigTable.vue.d.ts

@@ -641,9 +641,6 @@ declare const _default: import("vue").DefineComponent<{
         userInfo: Record<string, any>;
         sysImageSize: unknown[];
     }>;
-    handleSeqConfig: import("vue").ComputedRef<{
-        startIndex: number;
-    }>;
     treeConfig: import("vue").ComputedRef<null>;
     hideAllWrap: (e: any) => void;
     bindDocumentClick: () => void;

package/es/components/big-table/src/BigTable.vue_vue_type_script_setup_true_lang.js

@@ -136,21 +136,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         sysImageSize: props.sysImageSize || {}
       };
     });
-    const handleSeqConfig = computed(() => {
-      if (props.isNestTable)
-        return {
-          startIndex: 0
-        };
-      if (props.isBatchEditing) {
-        return {
-          startIndex: 0
-        };
-      }
-      let startIndex = (props.pageVO.pageIndex - 1) * props.pageVO.pageSize;
-      return {
-        startIndex: startIndex < 0 ? 0 : startIndex
-      };
-    });
     const treeConfig = computed(() => {
       let result = null;
       let {
@@ -2149,8 +2134,14 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     }, {
       immediate: true
     });
-    nextTick(() => {
-      loadData(props.data);
+    watch([() => props.data, () => {
+      var _a;
+      return (_a = props.data) == null ? void 0 : _a.length;
+    }], async ([value]) => {
+      await nextTick();
+      loadData(value);
+    }, {
+      immediate: true
     });
     watch(() => currentCheckedKeys, (val) => {
       setVisibleCheckAllWrap(state, props, currentCheckedKeys.value);
@@ -2314,10 +2305,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         "mouse-config": {
           selected: ((_a = _ctx.columnConfig.keyboardConfig) == null ? void 0 : _a.isEdit) ? true : false
         },
-        "seq-config": unref(handleSeqConfig),
         "tree-config": unref(treeConfig),
         "row-class-name": getRowClassName,
-        "cell-class-name": _ctx.columnConfig.cellClassName || null,
         "row-config": {
           ...state.rowConfig,
           ...unref(getAttr)("row-config")
@@ -2419,7 +2408,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           }
         })]),
         _: 3
-      }, 16, ["height", "mouse-config", "seq-config", "tree-config", "cell-class-name", "row-config", "show-footer", "sort-config", "tooltip-config", "checkbox-config", "radio-config", "scroll-y", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
+      }, 16, ["height", "mouse-config", "tree-config", "row-config", "show-footer", "sort-config", "tooltip-config", "checkbox-config", "radio-config", "scroll-y", "row-style", "edit-config", "expand-config", "keyboard-config", "edit-rules", "menu-config", "onScroll", "onKeydown"]), createCommentVNode(" `${refreshRow}\u6761\u66F4\u65B0` "), withDirectives(createElementVNode("div", {
         class: "refresh",
         onClick: hanldeClickRefresh
       }, [createVNode(unref(NIcon), {

package/es/components/big-table/src/components/edit-form/useCommon.d.ts

@@ -0,0 +1,4 @@
+export declare const useCommon: (props: any, attrs: any) => {
+    formRef: import("vue").Ref<HTMLElement | null>;
+    isShow: import("vue").Ref<boolean>;
+};

package/es/components/big-table/src/utils.d.ts

@@ -5,7 +5,7 @@ export declare const getMapVal: (row: any, item: any) => any;
 export declare const getageShowType: (row: any, item: any) => any;
 export declare const reScrollFilterWrap: () => void;
 export declare const showFilter: (field: any, columnName: any, event: any, props: any, state: any) => false | undefined;
-export declare const handleGroupColums: (columns: any, props: any) => any;
+export declare const handleGroupColums: (columns: any, props: any) => any[];
 export declare const handlerInitSearchItem: (arr: any) => void;
 export declare const generateEditRender: (fieldItem: any) => {
     name: string;

package/es/components/big-table/src/utils2.js

@@ -1,7 +1,8 @@
-import { nextTick } from 'vue';
+import img from '../../../shared/assets/img/xb_small.js';
 import XEUtils from 'xe-utils';
 import 'moment';
-import img from '../../../shared/assets/img/xb_small.js';
+import { nextTick } from 'vue';
+import { groupTraverser, createRowGroupList } from '../../iho-table/src/plugins/rowGroupSettingPlugin/rowGroupUtils2.js';
 
 const isJSON = (str) => {
   if (typeof str == "string") {
@@ -166,43 +167,16 @@ const showFilter = (field, columnName, event, props, state) => {
   field.indeterminate = !!len && len !== field.setting.showSetting.length;
   field.searchFilterText = "";
 };
-const handleRowColumns = (rowColumns, columns, key) => {
-  rowColumns.map((item) => {
-    var _a;
-    const children = [];
-    let spliceIndex = -1;
-    const indexArr = [];
-    ((_a = item.list) == null ? void 0 : _a.length) && item.list.forEach((v) => {
-      const matchItem = columns == null ? void 0 : columns.find((column) => column[key] === v);
-      if (matchItem) {
-        const matchIndex = columns.findIndex((column) => column[key] === v);
-        indexArr.push(matchIndex);
-        delete matchItem.fixed;
-        children.push(matchItem);
-        columns.splice(matchIndex, 1);
-      }
-    });
-    const obj = {
-      title: item.title,
-      align: "center",
-      children
-    };
-    spliceIndex = Math.min(...indexArr);
-    spliceIndex > -1 && columns.splice(spliceIndex, 0, obj);
-  });
-};
 const handleGroupColums = (columns, props) => {
   const { rowGroupSetting } = props;
-  if (!rowGroupSetting || !Object.keys(rowGroupSetting).length)
-    return columns;
-  const { firstRowGroup, secondRowGroup } = rowGroupSetting;
-  if (!firstRowGroup || !firstRowGroup.length)
-    return columns;
-  handleRowColumns(firstRowGroup, columns, "columnName");
-  if (!secondRowGroup || !secondRowGroup.length)
-    return columns;
-  handleRowColumns(secondRowGroup, columns, "title");
-  return columns;
+  return groupTraverser(createRowGroupList(rowGroupSetting, columns, (field) => field.columnName || field.type), (fieldName, isBlock) => {
+    if (isBlock)
+      return { field: fieldName, title: fieldName, align: "center" };
+    return fieldSearcher(fieldName, columns);
+  });
+  function fieldSearcher(fieldName, fieldList) {
+    return fieldList.find((field) => (field.columnName || field.type) === fieldName);
+  }
 };
 const handlerInitSearchItem = (arr) => {
   if (!Array.isArray(arr))

package/es/components/bpmn-workflow/types/BpmnViewer.d.ts

@@ -0,0 +1 @@
+declare module 'bpmn-js/lib/Viewer';

package/es/components/bpmn-workflow/types/ModelingModule.d.ts

@@ -0,0 +1 @@
+declare module 'bpmn-js/lib/features/modeling';

package/es/components/bpmn-workflow/types/MoveCanvasModule.d.ts

@@ -0,0 +1 @@
+declare module 'diagram-js/lib/navigation/movecanvas';

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

@@ -87,6 +87,11 @@ var PopupMenu = defineComponent({
     watch(() => props.show, (value) => {
       if (value) {
         setNoShow = true;
+        props.list.forEach((item) => {
+          if (typeof item === "object" && Reflect.has(item, "value") && typeof item.value !== "boolean") {
+            item.value = void 0;
+          }
+        });
       }
     });
     return () => {
@@ -98,12 +103,12 @@ var PopupMenu = defineComponent({
           "class": "c-fabric-chart-popup-menu",
           "style": pointStyle.value
         }, [props.list.map((item) => {
-          return createVNode("li", {
+          return props.show ? createVNode("li", {
             "class": {
               "no-click": setNoClick(item)
             },
             "onClick": (event) => clickItem(event, item)
-          }, [getItemContent(item)]);
+          }, [getItemContent(item)]) : null;
         })]), [[vShow, props.show]])]
       });
     };

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

@@ -20,6 +20,12 @@ function getPointArr(arr) {
     return pre;
   }, []);
 }
+function deleteProperty(data, list) {
+  list.map((v) => v.type).forEach((key) => {
+    if (Reflect.has(data, key))
+      Reflect.deleteProperty(data, key);
+  });
+}
 function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, getYValue, addRenderItem) {
   useGrid(canvas, propItems);
   const {
@@ -138,7 +144,6 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
       if (event2.button === 3) {
         const { x = 0, y = 0 } = event2.pointer || {};
         if (x >= originX && x <= endX && y >= originY && y <= endY) {
-          pointTipProps.show = false;
           pointMenuProps.point = { x, y };
           pointMenuProps.show = true;
           const { type } = ((_a = event2.target) == null ? void 0 : _a.origin) || {};
@@ -552,10 +557,9 @@ function useCenter(canvas, propItems, emits, cumputedX, cumputedY, getXValue, ge
         ...item.origin
       });
     } else {
-      const data = {
-        time: target.origin.data.time,
-        value: target.origin.data.value
-      };
+      const data = { ...target.origin.data };
+      deleteProperty(data, TEMPERATURE_MENU);
+      deleteProperty(data, PAIN_MENU);
       data[`${item.type}`] = item.value;
       if (target.origin.type === "temperature") {
         data["key"] = target.origin.key;

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

@@ -27,14 +27,10 @@ function useCanvasEvent(canvas, propItems, emits) {
       ...selectionStyle
     });
     canvas.value.add(rect);
-    rect.on("mousedown", () => {
-      emits("select", key);
-    });
     return rect;
   }
+  let selections = [];
   function initSelection() {
-    if (typeof (selectionStyle == null ? void 0 : selectionStyle.evented) === "boolean" && !(selectionStyle == null ? void 0 : selectionStyle.evented))
-      return;
     const selections2 = [];
     selections2.push(drawRect({
       left: iconsWidth,
@@ -73,17 +69,53 @@ function useCanvasEvent(canvas, propItems, emits) {
       width: endX - originX,
       height: endY - originY - 3
     }, "grid"));
+    selections2.forEach((obj) => {
+      if (obj.key.endsWith("All")) {
+        obj.sendToBack();
+        obj.on("mouseup", (event) => {
+          const { button, pointer } = event;
+          if (button == 1) {
+            const _key = obj.key.replace("All", "");
+            const key = pointer.x <= originX ? _key + "Title" : _key;
+            select(key);
+            emits("select", key);
+          }
+        });
+      } else {
+        obj.on("mousedown", () => {
+          emits("select", obj.key);
+        });
+        setTimeout(() => {
+          obj.bringToFront();
+        });
+      }
+    });
     canvas.value.renderAll();
     return selections2;
   }
-  const selections = initSelection();
+  function addSelectionListener() {
+    canvas.value.on("selection:cleared", selectionCB);
+    canvas.value.on("selection:updated", selectionCB);
+    function selectionCB(event) {
+      const { deselected = [] } = event;
+      deselected.forEach((obj) => {
+        obj.key.endsWith("All") && obj.sendToBack();
+      });
+    }
+  }
   function select(key) {
-    canvas.value.discardActiveObject();
-    canvas.value.renderAll();
+    canvas.value.discardActiveObject().renderAll();
     const obj = selections == null ? void 0 : selections.find((obj2) => obj2.key === key);
     obj == null ? void 0 : obj.bringToFront();
     obj && canvas.value.setActiveObject(obj);
   }
+  function init() {
+    if (typeof (selectionStyle == null ? void 0 : selectionStyle.evented) === "boolean" && !(selectionStyle == null ? void 0 : selectionStyle.evented))
+      return;
+    selections = initSelection();
+    addSelectionListener();
+  }
+  init();
   return { select };
 }