cnhis-design-vue 3.1.21-beta.5 → 3.1.21-beta.6

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

@@ -200,7 +200,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     resetInlineBatchEdit: FunctionConstructor;
     resetBatchEditRowStatus: FunctionConstructor;
     anchor: {
-        type: ArrayConstructor;
+        type: import("vue").PropType<import("../../../es/shared/types").AnyObject[]>;
         default: () => never[];
     };
 }, {
@@ -547,12 +547,15 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         resetInlineBatchEdit: FunctionConstructor;
         resetBatchEditRowStatus: FunctionConstructor;
         anchor: {
-            type: ArrayConstructor;
+            type: import("vue").PropType<import("../../../es/shared/types").AnyObject[]>;
             default: () => never[];
         };
     }>> & {
         [x: `on${string}`]: ((...args: any[]) => any) | undefined;
     }>>;
+    attr: {
+        [x: string]: unknown;
+    };
     formatData: (data?: {
         tableList: any[];
         fieldList: any[];
@@ -579,6 +582,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         'border-color': any;
         color?: undefined;
     };
+    getAttr: (field: string) => any;
     imgs2imgArr: (imgs: any) => any;
     parseDurationValue: (v: any, duration: any) => string | undefined;
     parseCombinationValue: (value: any, setting: any) => any;
@@ -621,9 +625,6 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         $event: KeyboardEvent;
     }) => void;
     scroll: (params: any) => void;
-    attr: {
-        [x: string]: unknown;
-    };
     currentCheckedKeys: import("vue").ComputedRef<never[]>;
     visibleCancelCheckAllBtn: import("vue").ComputedRef<boolean>;
     singleCheckedKey: import("vue").ComputedRef<string>;
@@ -883,7 +884,7 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
         style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
         class: import("vue").Ref<string | undefined>;
         mergedClsPrefix: import("vue").Ref<string>;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | (() => import("vue").VNodeChild)>;
@@ -1116,13 +1117,13 @@ declare const BigTable: SFCWithInstall<import("vue").DefineComponent<{
     resetInlineBatchEdit: FunctionConstructor;
     resetBatchEditRowStatus: FunctionConstructor;
     anchor: {
-        type: ArrayConstructor;
+        type: import("vue").PropType<import("../../../es/shared/types").AnyObject[]>;
         default: () => never[];
     };
 }>> & {
     [x: `on${string}`]: ((...args: any[]) => any) | undefined;
 }, {
-    anchor: unknown[];
+    anchor: import("../../../es/shared/types").AnyObject[];
     data: unknown[];
     showFooter: boolean;
     columnConfig: Record<string, any>;

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

@@ -198,7 +198,7 @@ declare const _default: import("vue").DefineComponent<{
     resetInlineBatchEdit: FunctionConstructor;
     resetBatchEditRowStatus: FunctionConstructor;
     anchor: {
-        type: ArrayConstructor;
+        type: import("vue").PropType<import("../../../shared/types").AnyObject[]>;
         default: () => never[];
     };
 }, {
@@ -545,12 +545,15 @@ declare const _default: import("vue").DefineComponent<{
         resetInlineBatchEdit: FunctionConstructor;
         resetBatchEditRowStatus: FunctionConstructor;
         anchor: {
-            type: ArrayConstructor;
+            type: import("vue").PropType<import("../../../shared/types").AnyObject[]>;
             default: () => never[];
         };
     }>> & {
         [x: `on${string}`]: ((...args: any[]) => any) | undefined;
     }>>;
+    attr: {
+        [x: string]: unknown;
+    };
     formatData: (data?: {
         tableList: any[];
         fieldList: any[];
@@ -577,6 +580,7 @@ declare const _default: import("vue").DefineComponent<{
         'border-color': any;
         color?: undefined;
     };
+    getAttr: (field: string) => any;
     imgs2imgArr: (imgs: any) => any;
     parseDurationValue: (v: any, duration: any) => string | undefined;
     parseCombinationValue: (value: any, setting: any) => any;
@@ -619,9 +623,6 @@ declare const _default: import("vue").DefineComponent<{
         $event: KeyboardEvent;
     }) => void;
     scroll: (params: any) => void;
-    attr: {
-        [x: string]: unknown;
-    };
     currentCheckedKeys: import("vue").ComputedRef<never[]>;
     visibleCancelCheckAllBtn: import("vue").ComputedRef<boolean>;
     singleCheckedKey: import("vue").ComputedRef<string>;
@@ -881,7 +882,7 @@ declare const _default: import("vue").DefineComponent<{
         style: import("vue").Ref<string | import("vue").CSSProperties | undefined>;
         class: import("vue").Ref<string | undefined>;
         mergedClsPrefix: import("vue").Ref<string>;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         readonly tab: import("vue").PropType<string | number | import("vue").VNode<import("vue").RendererNode, import("vue").RendererElement, {
             [key: string]: any;
         }> | (() => import("vue").VNodeChild)>;
@@ -1114,13 +1115,13 @@ declare const _default: import("vue").DefineComponent<{
     resetInlineBatchEdit: FunctionConstructor;
     resetBatchEditRowStatus: FunctionConstructor;
     anchor: {
-        type: ArrayConstructor;
+        type: import("vue").PropType<import("../../../shared/types").AnyObject[]>;
         default: () => never[];
     };
 }>> & {
     [x: `on${string}`]: ((...args: any[]) => any) | undefined;
 }, {
-    anchor: unknown[];
+    anchor: import("../../../shared/types").AnyObject[];
     data: unknown[];
     showFooter: boolean;
     columnConfig: Record<string, any>;

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

@@ -57,11 +57,13 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     const xGrid = ref({});
     const copyState = XEUtils.clone(bigTableState, true);
     const state = reactive(copyState);
+    const attr = useAttrs();
     const {
       formatData,
       htmlToText,
-      getBtnStyle
-    } = useFormat(state);
+      getBtnStyle,
+      getAttr
+    } = useFormat(state, attr);
     const {
       imgs2imgArr,
       parseDurationValue,
@@ -104,7 +106,6 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       keyDown,
       scroll
     } = useEvent(props, state, emit, xGrid, anchorEvent);
-    const attr = useAttrs();
     const currentCheckedKeys = computed(() => {
       var _a;
       return ((_a = state.checkedRows) == null ? void 0 : _a.map((row) => row[props.primaryKey])) || [];
@@ -2334,20 +2335,20 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         "cell-class-name": _ctx.columnConfig.cellClassName || null,
         "row-config": {
           ...state.rowConfig,
-          ..._ctx.$attrs.rowConfig || {}
+          ...unref(getAttr)("row-config")
         },
         "show-footer": _ctx.showFooter && !props.isInlineOperating,
         "footer-method": footerMethod,
         "sort-config": {
           trigger: "cell",
           remote: true,
-          ..._ctx.$attrs.sortConfig || {}
+          ...unref(getAttr)("sort-config")
         },
         "span-method": colspanMethod,
         "footer-span-method": footerRowspanMethod,
         "tooltip-config": {
           enterable: false,
-          ..._ctx.$attrs.tooltipConfig || {}
+          ...unref(getAttr)("tooltip-config")
         },
         "checkbox-config": {
           checkField: "checked",
@@ -2357,18 +2358,18 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           trigger: "cell",
           reserve: true,
           highlight: true,
-          ..._ctx.$attrs.checkboxConfig || {}
+          ...unref(getAttr)("checkbox-config")
         },
         "radio-config": {
           checkField: "checked",
           trigger: "cell",
           reserve: true,
           highlight: true,
-          ..._ctx.$attrs.radioConfig || {}
+          ...unref(getAttr)("radio-config")
         },
         "scroll-y": {
           gt: 50,
-          ..._ctx.$attrs.scrollY || {}
+          ...unref(getAttr)("scroll-y")
         },
         "row-style": unref(getRowStyle),
         "edit-config": state.editConfig,
@@ -2379,7 +2380,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           toggleMethod: unref(toggleExpandMethod),
           iconOpen: "iconfont icon-a-xitongtubiaozhediejian",
           iconClose: "iconfont icon-a-xitongtubiaotianjia",
-          ..._ctx.$attrs.expandConfig || {}
+          ...unref(getAttr)("expand-config")
         },
         "keyboard-config": _ctx.columnConfig.keyboardConfig || {},
         "edit-rules": _ctx.columnConfig.editRules || {},

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

@@ -200,7 +200,7 @@ declare const bigTableProps: {
     resetInlineBatchEdit: FunctionConstructor;
     resetBatchEditRowStatus: FunctionConstructor;
     anchor: {
-        type: ArrayConstructor;
+        type: PropType<AnyObject[]>;
         default: () => never[];
     };
 };

package/es/components/big-table/src/hooks/useFormat.d.ts

@@ -1,4 +1,5 @@
-export declare const useFormat: (state: any) => {
+import { AnyObject } from '../../../../../es/shared/types';
+export declare const useFormat: (state: any, attr: AnyObject) => {
     formatData: (data?: {
         tableList: any[];
         fieldList: any[];
@@ -25,4 +26,5 @@ export declare const useFormat: (state: any) => {
         'border-color': any;
         color?: undefined;
     };
+    getAttr: (field: string) => any;
 };

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

@@ -1,7 +1,7 @@
 import XEUtils from 'xe-utils';
 import 'moment';
 
-const useFormat = (state) => {
+const useFormat = (state, attr) => {
   const formatData = (data = {
     tableList: [],
     fieldList: [],
@@ -482,10 +482,19 @@ const useFormat = (state) => {
       "border-color": v.color
     };
   };
+  function getAttr(field) {
+    if (attr[field])
+      return attr[field];
+    const newField = field.replace(/-(\w)/g, ($0, $1) => {
+      return $1.toUpperCase();
+    });
+    return attr[newField] || {};
+  }
   return {
     formatData,
     htmlToText,
-    getBtnStyle
+    getBtnStyle,
+    getAttr
   };
 };
 

package/es/components/button-print/index.d.ts

@@ -383,7 +383,7 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
                 key: string;
                 render: () => import("vue").VNodeChild;
             }[]>;
-        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             readonly label: StringConstructor;
             readonly labelWidth: import("vue").PropType<string | number>;
             readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;

package/es/components/button-print/src/ButtonPrint.vue.d.ts

@@ -387,7 +387,7 @@ declare const _default: import("vue").DefineComponent<{
                 key: string;
                 render: () => import("vue").VNodeChild;
             }[]>;
-        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+        }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
             readonly label: StringConstructor;
             readonly labelWidth: import("vue").PropType<string | number>;
             readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;

package/es/components/button-print/src/components/IdentityVerification.vue.d.ts

@@ -210,7 +210,7 @@ declare const _default: import("vue").DefineComponent<{
             key: string;
             render: () => import("vue").VNodeChild;
         }[]>;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         readonly label: StringConstructor;
         readonly labelWidth: import("vue").PropType<string | number>;
         readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;

package/es/components/drag-layout/index.d.ts

@@ -205,7 +205,7 @@ declare const DragLayout: SFCWithInstall<import("vue").DefineComponent<{
         } | null>;
         validate: import("naive-ui/es/form/src/interface").FormItemValidate;
         restoreValidation: () => void;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         readonly label: StringConstructor;
         readonly labelWidth: import("vue").PropType<string | number>;
         readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;

package/es/components/drag-layout/src/DragLayout.vue.d.ts

@@ -205,7 +205,7 @@ declare const _default: import("vue").DefineComponent<{
         } | null>;
         validate: import("naive-ui/es/form/src/interface").FormItemValidate;
         restoreValidation: () => void;
-    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
+    }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, Record<string, any>, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<import("vue").ExtractPropTypes<{
         readonly label: StringConstructor;
         readonly labelWidth: import("vue").PropType<string | number>;
         readonly labelStyle: import("vue").PropType<string | import("vue").CSSProperties>;

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

@@ -1,4 +1,4 @@
-import { defineComponent, ref, createVNode, Teleport, withDirectives, vShow } from 'vue';
+import { defineComponent, ref, watch, createVNode, Teleport, withDirectives, vShow } from 'vue';
 import { NSpace, NInputNumber } from 'naive-ui';
 import useStyle from './useStyle2.js';
 import { onClickOutside } from '@vueuse/core';
@@ -31,9 +31,11 @@ var PopupMenu = defineComponent({
     slots,
     emit
   }) {
+    let setNoShow = false;
     const popupRef = ref(null);
     onClickOutside(popupRef, (event) => {
-      emit("update:show", false);
+      !setNoShow && emit("update:show", false);
+      setNoShow = false;
     });
     const {
       left
@@ -81,6 +83,11 @@ var PopupMenu = defineComponent({
         });
       }
     }
+    watch(() => props.show, (value) => {
+      if (value) {
+        setNoShow = true;
+      }
+    });
     return () => {
       return createVNode(Teleport, {
         "to": ".c-fabric-chart"