cnhis-design-vue 3.1.33 → 3.1.34-beta.0

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/button-print/src/ButtonPrint.vue2.js

@@ -200,6 +200,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         };
         if (props.strategy === "MULTI") {
           for (let i = 0; i < state.printParams.length; i++) {
+            if (i > 0)
+              queryParams.printdlgshow = "0";
             printInstance.printDirect({
               ...queryParams,
               params: getPrintParams(i)

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/dateRendererPlugin/editDate.vue.d.ts

@@ -1,6 +1,6 @@
 import { Func } from '../../../../../../../../es/shared/types';
 import { PropType } from 'vue';
-import { IhoTableFieldItem } from '../../../../../../../../es/components/iho-table';
+import { VxeTableDefines } from 'vxe-table';
 import { AnyObject } from '../../../../../../../../es/shared/types';
 declare const _default: import("vue").DefineComponent<{
     value: {
@@ -8,14 +8,14 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
     column: {
-        type: PropType<IhoTableFieldItem>;
+        type: PropType<VxeTableDefines.ColumnInfo>;
         required: true;
     };
     row: {
         type: PropType<AnyObject>;
         required: true;
     };
-    index: {
+    rowIndex: {
         type: NumberConstructor;
         required: true;
     };
@@ -27,22 +27,22 @@ declare const _default: import("vue").DefineComponent<{
             default: undefined;
         };
         column: {
-            type: PropType<IhoTableFieldItem>;
+            type: PropType<VxeTableDefines.ColumnInfo>;
             required: true;
         };
         row: {
             type: PropType<AnyObject>;
             required: true;
         };
-        index: {
+        rowIndex: {
             type: NumberConstructor;
             required: true;
         };
     }>> & {
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
     }>>;
+    emitFormChange: (params?: AnyObject) => void;
     emit: (event: "update:value", ...args: any[]) => void;
-    globEmit: import("../../../../../../../../es/components/iho-table").IhoTableEmits;
     formRef: import("vue").Ref<HTMLElement | null>;
     isShow: import("vue").Ref<boolean>;
     formattedValue: import("vue").Ref<string | undefined>;
@@ -77,14 +77,14 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
     column: {
-        type: PropType<IhoTableFieldItem>;
+        type: PropType<VxeTableDefines.ColumnInfo>;
         required: true;
     };
     row: {
         type: PropType<AnyObject>;
         required: true;
     };
-    index: {
+    rowIndex: {
         type: NumberConstructor;
         required: true;
     };

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/dateRendererPlugin/editDate.vue.js

@@ -1,9 +1,9 @@
-import { defineComponent, useAttrs, inject, ref, computed, watch, openBlock, createBlock, unref, mergeProps, withCtx, createVNode, isRef } from 'vue';
+import { defineComponent, useAttrs, ref, computed, watch, openBlock, createBlock, unref, mergeProps, withCtx, createVNode, isRef } from 'vue';
 import { generateTimeFormat } from '../../../../../../../shared/utils/index.js';
 import { isFunction, isNaN } from 'lodash-es';
 import { NPopover, NInput, NDatePicker } from 'naive-ui';
-import { InjectionIhoTableEmits } from '../../../../constants/index.js';
-import { useCommon } from '../hooks/useCommon.js';
+import { useIhoTableFormEvent } from '../../../../utils/index.js';
+import { useAutoFocus } from '../hooks/useAutoFocus.js';
 import _export_sfc from '../../../../../../../_virtual/plugin-vue_export-helper.js';
 
 const _sfc_main = /* @__PURE__ */ defineComponent({
@@ -12,23 +12,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     value: { type: String, default: void 0 },
     column: { type: Object, required: true },
     row: { type: Object, required: true },
-    index: { type: Number, required: true }
+    rowIndex: { type: Number, required: true }
   },
   emits: ["update:value"],
   setup(__props, { emit }) {
     const props = __props;
     const attr = useAttrs();
-    const globEmit = inject(InjectionIhoTableEmits);
-    const { formRef, isShow } = useCommon();
+    const { emitFormChange } = useIhoTableFormEvent(props);
+    const { formRef, isShow } = useAutoFocus();
     const formattedValue = ref();
     const onConfirm = (value) => {
+      const oldValue = props.value;
       emit("update:value", value);
-      globEmit("formChange", {
-        value,
-        row: props.row,
-        column: props.column,
-        index: props.index
-      });
+      emitFormChange({ oldValue });
     };
     const { isStartDate = false, isEndDate = false } = attr;
     const connectField = attr.connectField || "";

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

@@ -17,7 +17,7 @@ function dateRendererPlugin() {
           emitFormClick,
           row,
           column,
-          $rowIndex
+          rowIndex
         }) => {
           return [createVNode(EditDate, mergeProps({
             "value": row[column.field],
@@ -25,7 +25,7 @@ function dateRendererPlugin() {
           }, fieldItem.componentProps, {
             "column": column,
             "row": row,
-            "index": $rowIndex,
+            "row-index": rowIndex,
             "onClick": emitFormClick
           }), null)];
         })

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/hooks/{useCommon.d.ts → useAutoFocus.d.ts}

@@ -1,4 +1,5 @@
-export declare const useCommon: () => {
+export declare const useAutoFocus: () => {
     formRef: import("vue").Ref<HTMLElement | null>;
+    setRef: (ref: HTMLElement) => void;
     isShow: import("vue").Ref<boolean>;
 };

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/hooks/{useCommon.js → useAutoFocus.js}

@@ -1,7 +1,10 @@
 import { ref, onMounted } from 'vue';
 
-const useCommon = () => {
+const useAutoFocus = () => {
   const formRef = ref(null);
+  function setRef(ref2) {
+    formRef.value = ref2;
+  }
   const isShow = ref(false);
   onMounted(() => {
     var _a;
@@ -10,8 +13,9 @@ const useCommon = () => {
   });
   return {
     formRef,
+    setRef,
     isShow
   };
 };
 
-export { useCommon };
+export { useAutoFocus };

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

@@ -22,8 +22,10 @@ function inputRendererPlugin() {
           return [createVNode(NInput, mergeProps({
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event,
-            "onBlur": emitFormChange,
-            "onClick": emitFormClick
+            "onBlur": () => emitFormChange({
+              oldValue: row[column.field]
+            }),
+            "onClick": () => emitFormClick()
           }, fieldItem.componentProps), null)];
         })
       });

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

@@ -17,8 +17,7 @@ function numberRendererPlugin() {
           column,
           fieldItem,
           emitFormClick,
-          emitFormChange,
-          createCustomEvent
+          emitFormChange
         }) => {
           const {
             placeholder = "\u8BF7\u8F93\u5165"
@@ -27,10 +26,17 @@ function numberRendererPlugin() {
             ...fieldItem.componentProps || {},
             clearable: true,
             placeholder,
-            onBlur: createCustomEvent("formChange", {
-              type: "blur"
+            onBlur: () => emitFormChange({
+              type: "blur",
+              oldValue: row[column.field]
             }),
-            onUpdateValue: emitFormChange,
+            onUpdateValue: (value) => {
+              const oldValue = row[column.field];
+              row[column.field] = value;
+              emitFormChange({
+                oldValue
+              });
+            },
             onClick: emitFormClick
           };
           return [createVNode(NInputNumber, mergeProps({

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/selectRendererPlugin/editSelect.d.ts

@@ -1,5 +1,5 @@
 import { PropType } from 'vue';
-import { IhoTableFieldItem } from '../../../../../../../../es/components/iho-table';
+import { VxeTableDefines } from 'vxe-table';
 import { AnyObject } from '../../../../../../../../es/shared/types';
 declare const _default: import("vue").DefineComponent<{
     value: {
@@ -7,14 +7,14 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
     column: {
-        type: PropType<IhoTableFieldItem>;
+        type: PropType<VxeTableDefines.ColumnInfo>;
         required: true;
     };
     row: {
         type: PropType<AnyObject>;
         required: true;
     };
-    index: {
+    rowIndex: {
         type: NumberConstructor;
         required: true;
     };
@@ -24,14 +24,14 @@ declare const _default: import("vue").DefineComponent<{
         default: undefined;
     };
     column: {
-        type: PropType<IhoTableFieldItem>;
+        type: PropType<VxeTableDefines.ColumnInfo>;
         required: true;
     };
     row: {
         type: PropType<AnyObject>;
         required: true;
     };
-    index: {
+    rowIndex: {
         type: NumberConstructor;
         required: true;
     };

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

@@ -1,7 +1,7 @@
-import { defineComponent, inject, createVNode, mergeProps } from 'vue';
+import { defineComponent, createVNode, mergeProps } from 'vue';
 import { NSelect } from 'naive-ui';
-import { InjectionIhoTableEmits } from '../../../../constants/index.js';
-import { useCommon } from '../hooks/useCommon.js';
+import { useIhoTableFormEvent } from '../../../../utils/index.js';
+import { useAutoFocus } from '../hooks/useAutoFocus.js';
 
 var EditSelect = defineComponent({
   name: "EditSelect",
@@ -22,7 +22,7 @@ var EditSelect = defineComponent({
       type: Object,
       required: true
     },
-    index: {
+    rowIndex: {
       type: Number,
       required: true
     }
@@ -30,25 +30,24 @@ var EditSelect = defineComponent({
   emits: ["update:value"],
   setup(props, {
     attrs,
-    slots,
     emit
   }) {
-    const globEmit = inject(InjectionIhoTableEmits);
     const {
-      formRef,
-      isShow
-    } = useCommon();
+      isShow,
+      setRef
+    } = useAutoFocus();
+    const {
+      emitFormChange
+    } = useIhoTableFormEvent(props);
     function onUpdateValue(value) {
+      const oldValue = props.value;
       emit("update:value", value);
-      globEmit("formChange", {
-        value,
-        row: props.row,
-        column: props.column,
-        index: props.index
+      emitFormChange({
+        oldValue
       });
     }
     return () => createVNode(NSelect, mergeProps({
-      "ref": "formRef",
+      "ref": setRef,
       "show": isShow.value,
       "onUpdate:show": ($event) => isShow.value = $event
     }, attrs, {

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

@@ -24,12 +24,12 @@ function selectRendererPlugin() {
           emitFormClick,
           row,
           column,
-          $rowIndex
+          rowIndex
         }) => {
           return [createVNode(EditSelect, mergeProps(fieldItem.componentProps, {
             "column": column,
             "row": row,
-            "index": $rowIndex,
+            "row-index": rowIndex,
             "value": row[column.field],
             "onUpdate:value": ($event) => row[column.field] = $event,
             "onClick": emitFormClick

package/es/components/iho-table/src/plugins/rendererPlugins/editableWidgets/separateRendererPlugin/editSeparate.vue.d.ts

@@ -1,6 +1,6 @@
 import { AnyObject } from '../../../../../../../../es/shared/types';
 import { CSSProperties, PropType } from 'vue';
-import { IhoTableFieldItem } from '../../../../../../../../es/components/iho-table';
+import { VxeTableDefines } from 'vxe-table';
 declare const _default: import("vue").DefineComponent<{
     value: {};
     height: {
@@ -8,7 +8,7 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
     column: {
-        type: PropType<IhoTableFieldItem>;
+        type: PropType<VxeTableDefines.ColumnInfo>;
         required: true;
     };
     row: {
@@ -19,7 +19,7 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    dataIndex: {
+    rowIndex: {
         type: NumberConstructor;
         required: true;
     };
@@ -31,7 +31,7 @@ declare const _default: import("vue").DefineComponent<{
             default: number;
         };
         column: {
-            type: PropType<IhoTableFieldItem>;
+            type: PropType<VxeTableDefines.ColumnInfo>;
             required: true;
         };
         row: {
@@ -42,15 +42,14 @@ declare const _default: import("vue").DefineComponent<{
             type: StringConstructor;
             default: string;
         };
-        dataIndex: {
+        rowIndex: {
             type: NumberConstructor;
             required: true;
         };
     }>> & {
         "onUpdate:value"?: ((...args: any[]) => any) | undefined;
     }>>;
-    globEmit: import("../../../../../../../../es/components/iho-table").IhoTableEmits;
-    tableHandler: import("../../../../../../../../es/components/iho-table").IhoTableHandler;
+    tableHandler: import("../../../../types").IhoTableHandler;
     popoverRef: import("vue").Ref<any>;
     editContent: import("vue").Ref<any>;
     setEditContent: (value: any) => void;
@@ -58,6 +57,7 @@ declare const _default: import("vue").DefineComponent<{
     setShow: (v: boolean) => void;
     emit: (event: "update:value", ...args: any[]) => void;
     onShow: () => Promise<void>;
+    emitFormChange: (params?: AnyObject) => void;
     onClose: () => Promise<void>;
     updateShow: (show: boolean) => void;
     style: import("vue").ComputedRef<CSSProperties>;
@@ -70,7 +70,7 @@ declare const _default: import("vue").DefineComponent<{
         default: number;
     };
     column: {
-        type: PropType<IhoTableFieldItem>;
+        type: PropType<VxeTableDefines.ColumnInfo>;
         required: true;
     };
     row: {
@@ -81,7 +81,7 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
-    dataIndex: {
+    rowIndex: {
         type: NumberConstructor;
         required: true;
     };