cnhis-design-vue 3.1.22-beta.8 → 3.1.22

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

@@ -329,14 +329,6 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
             showInsertStatus?: boolean | undefined;
             showAsterisk?: boolean | undefined;
             autoClear?: boolean | undefined;
-            beforeEditMethod?: ((params: {
-                row: any;
-                rowIndex: number;
-                column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                columnIndex: number;
-                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
-                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
-            }) => boolean) | undefined;
             activeMethod?: ((params: {
                 row: any;
                 rowIndex: number;

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

@@ -327,14 +327,6 @@ declare const _default: import("vue").DefineComponent<{
             showInsertStatus?: boolean | undefined;
             showAsterisk?: boolean | undefined;
             autoClear?: boolean | undefined;
-            beforeEditMethod?: ((params: {
-                row: any;
-                rowIndex: number;
-                column: import("vxe-table").VxeTableDefines.ColumnInfo;
-                columnIndex: number;
-                $table: import("vxe-table").VxeTableConstructor & import("vxe-table").VxeTablePrivateMethods;
-                $grid: import("vxe-table").VxeGridConstructor | null | undefined;
-            }) => boolean) | undefined;
             activeMethod?: ((params: {
                 row: any;
                 rowIndex: number;

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

@@ -87,7 +87,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       deleteRow,
       onFormChange,
       getDefaultValue
-    } = useEdit(props, state, emit, xGrid);
+    } = useEdit(props, state, emit, xGrid, loadData);
     const {
       isAboutNestTable,
       isExpandTable,
@@ -262,40 +262,31 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       onColumnResize(payload);
       emit("resizableChange", payload);
     };
-    const loadData = async (data) => {
+    async function loadData(data) {
       state.isShowEmpty = !(data == null ? void 0 : data.length);
-      let list = JSON.parse(JSON.stringify(data));
+      let formatList = data;
       let {
         isTransform
       } = props.tableParams;
       if (isTransform && [1, 3].includes(Number(state.isTree)))
-        list = treeToList(list);
+        formatList = treeToList(data);
       let table = xGrid.value;
       if (!table)
         return;
       state.checkedRows = [];
-      let formatList = setChecklist(list);
       state.originFormatList = formatList;
       setGroupTitleToFristColumnFieldData(formatList);
-      state.curAbleCheckedLen = list.filter((item) => checkMethod({
+      state.curAbleCheckedLen = formatList.filter((item) => checkMethod({
         row: item
       })).length;
       if (!props.isNestTable) {
         await handleFormTheUniqueKey();
       }
-      formatList = formatList.map((v) => {
-        return {
-          ...v,
-          selectTableShow: false,
-          selectTableDisable: false
-        };
-      });
       await table.loadData(await separate(formatList, data));
       table.setCurrentRow({});
       setCurrentPageRowChecked();
       setGroupTreeExpand();
-      resetTableInlineEditStatus();
-    };
+    }
     separateHandle.clear();
     separateHandle.add(() => loadData(props.data));
     const setGroupTitleToFristColumnFieldData = (formatList) => {
@@ -544,7 +535,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         },
         editTrigger: state.editConfig.trigger
       };
-      if (formType === "date" || formType === "time") {
+      if (["date", "time"].includes(formType)) {
         propsData.formattedValue = row[col.columnName];
       } else if (formatMap) {
         propsData.value = row[formatMap.value];
@@ -2158,13 +2149,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     }, {
       immediate: true
     });
-    watch(() => props.data, (value) => {
-      nextTick(() => {
-        loadData(value);
-      });
-    }, {
-      immediate: true,
-      deep: true
+    nextTick(() => {
+      loadData(props.data);
     });
     watch(() => currentCheckedKeys, (val) => {
       setVisibleCheckAllWrap(state, props, currentCheckedKeys.value);

package/es/components/big-table/src/components/edit-form/edit-date.js

@@ -1,7 +1,7 @@
-import { defineComponent, computed, createVNode, mergeProps } from 'vue';
+import { defineComponent, ref, computed, watch, createVNode, mergeProps } from 'vue';
 import { generateTimeFormat } from '../../../../../shared/utils/index2.js';
-import { isFunction } from 'lodash-es';
-import { NDatePicker } from 'naive-ui';
+import { isFunction, isNaN } from 'lodash-es';
+import { NDatePicker, NPopover, NInput } from 'naive-ui';
 import { useCommon } from './useCommon2.js';
 
 var EditDate = defineComponent({
@@ -33,7 +33,9 @@ var EditDate = defineComponent({
       formRef,
       isShow
     } = useCommon(props, attrs);
+    const __value = ref(attrs.formattedValue);
     const onConfirm = (value) => {
+      __value.value = value;
       emit("formChange", {
         value,
         row: props.row,
@@ -107,6 +109,45 @@ var EditDate = defineComponent({
         return customDateDisabled(ts, props.row);
       };
     }
+    function getFormatDate(str) {
+      if (!str)
+        return "";
+      const d = new Date(str);
+      const month = `00${d.getMonth() + 1}`.slice(-2);
+      const day = `00${d.getDate()}`.slice(-2);
+      const valueFormat = formatConfig.value.valueFormat;
+      const format = valueFormat.includes("/") ? "/" : valueFormat.includes(".") ? "." : "-";
+      let date = `${d.getFullYear()}${format}${month}${format}${day}`;
+      const dTime = d.getTime();
+      const connectFieldTime = new Date(props.row[connectField]).getTime();
+      if (props.row[connectField] && (isStartDate && dTime > connectFieldTime || isEndDate && dTime < connectFieldTime)) {
+        date = "";
+      }
+      return date;
+    }
+    function onBlur() {
+      let date = __value.value;
+      if (isNaN(new Date(date).getTime())) {
+        if (/^\d{8}$/.test(date)) {
+          const dateNew = `${date.slice(0, 4)} ${date.slice(4, 6)} ${date.slice(6)}`;
+          date = "";
+          if (!isNaN(new Date(dateNew).getTime())) {
+            date = getFormatDate(dateNew);
+          }
+        } else {
+          date = "";
+        }
+      } else {
+        date = getFormatDate(date);
+      }
+      __value.value = date || void 0;
+      emit("formChange", {
+        value: __value.value,
+        row: props.row,
+        column: props.col,
+        index: props.index
+      });
+    }
     const formatConfig = computed(() => {
       var _a;
       const valueFormat = ((_a = props.col.componentProps) == null ? void 0 : _a.valueFormat) || props.col.valueFormat || "yyyy-MM-dd HH:mm:ss";
@@ -130,13 +171,43 @@ var EditDate = defineComponent({
     if (config.type.includes("time")) {
       config.isTimeDisabled = customDateDisabledDecorator(props.col.isTimeDisabled) || isTimeDisabled;
     }
-    return () => createVNode(NDatePicker, mergeProps({
-      "ref": formRef,
-      "show": isShow.value,
-      "onUpdate:show": ($event) => isShow.value = $event
-    }, attrs, config, {
-      "onUpdateFormattedValue": onConfirm
-    }), null);
+    watch(() => attrs.formattedValue, (value) => {
+      __value.value = value;
+    });
+    return () => {
+      var _a;
+      return ((_a = props.col.componentProps) == null ? void 0 : _a.isPopover) ? createVNode(NPopover, mergeProps({
+        "show": isShow.value,
+        "trigger": "click",
+        "showArrow": false,
+        "placement": "bottom-start",
+        "style": "padding: 0"
+      }, props.col.componentProps || {}, {
+        "onClickoutside": () => isShow.value = false
+      }), {
+        trigger: () => createVNode(NInput, {
+          "ref": formRef,
+          "clearable": true,
+          "value": __value.value,
+          "onUpdate:value": ($event) => __value.value = $event,
+          "onBlur": onBlur,
+          "onClick": () => isShow.value = true
+        }, null),
+        default: () => createVNode(NDatePicker, mergeProps({
+          "panel": true,
+          "show": isShow.value,
+          "onUpdate:show": ($event) => isShow.value = $event
+        }, attrs, config, {
+          "onUpdateFormattedValue": onConfirm
+        }), null)
+      }) : createVNode(NDatePicker, mergeProps({
+        "ref": formRef,
+        "show": isShow.value,
+        "onUpdate:show": ($event) => isShow.value = $event
+      }, attrs, config, {
+        "onUpdateFormattedValue": onConfirm
+      }), null);
+    };
   }
 });
 

package/es/components/big-table/src/components/edit-form/edit-input.js

@@ -54,6 +54,7 @@ var EditInput = defineComponent({
       });
     }
     const config = {
+      clearable: true,
       placeholder: props.col.placeholder || "\u8BF7\u8F93\u5165",
       ...props.col.componentProps || {}
     };

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/hooks/useEdit.d.ts

@@ -322,7 +322,7 @@ export declare const comps: {
         onFormChange?: ((...args: any[]) => any) | undefined;
     }, {}>;
 };
-export declare const useEdit: (props: any, state: any, emit: any, xGrid: any) => {
+export declare const useEdit: (props: any, state: any, emit: any, xGrid: any, loadData: (data: unknown) => void) => {
     initEditTable: () => Promise<void>;
     deleteRow: (row: any, col: any, index: number) => void;
     onClickSelectTable: (row: any) => Promise<void>;

package/es/components/big-table/src/hooks/useEdit2.js

@@ -12,7 +12,7 @@ const comps = {
   time: EditTime,
   separate: EditSeparate
 };
-const useEdit = (props, state, emit, xGrid) => {
+const useEdit = (props, state, emit, xGrid, loadData) => {
   const initEditTable = async () => {
     const { isEdit, fieldList = [] } = props.columnConfig;
     if (!isEdit)
@@ -65,7 +65,7 @@ const useEdit = (props, state, emit, xGrid) => {
   }) => {
     var _a, _b;
     let oldValue = row[column.columnName];
-    if (((column == null ? void 0 : column.formType) === "input" || (column == null ? void 0 : column.formType) === "number") && ((_a = props.columnConfig) == null ? void 0 : _a.formValidate)) {
+    if (["input", "number"].includes(column == null ? void 0 : column.formType) && ((_a = props.columnConfig) == null ? void 0 : _a.formValidate)) {
       row[column.columnName] = (_b = props.columnConfig) == null ? void 0 : _b.formValidate({
         row,
         column,
@@ -82,9 +82,12 @@ const useEdit = (props, state, emit, xGrid) => {
     } else {
       row[column.columnName] = value;
     }
-    if (((column == null ? void 0 : column.formType) === "date" || (column == null ? void 0 : column.formType) === "time") && !value) {
+    if (["date", "time"].includes(column == null ? void 0 : column.formType) && !value) {
       row[column.columnName] = void 0;
     }
+    if (["separate"].includes(column == null ? void 0 : column.formType)) {
+      loadData(props.data);
+    }
     emit("formChange", { value, row, column, index, oldValue, ...type ? { type } : {} });
   };
   const getDefaultValue = (params, item) => {

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

@@ -355,7 +355,6 @@ const treeToList = (treeData) => {
         item.qianduan_parent_id = key || null;
         if (item.childrenList) {
           deepFilter(item.childrenList, item.qianduan_id);
-          Reflect.deleteProperty(item, "childrenList");
         }
         res.push(item);
       });

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';