cnhis-design-vue 3.1.33-beta.9 → 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/big-table/index.d.ts

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

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

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

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

@@ -137,7 +137,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       };
     });
     const treeConfig = computed(() => {
-      let result = null;
+      let result = getAttr("tree-config");
       let {
         isTransform
       } = props.tableParams;
@@ -529,7 +529,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         editTrigger: state.editConfig.trigger
       };
       if (["date", "time"].includes(formType)) {
-        propsData.formattedValue = row[col.columnName];
+        propsData.formattedValue = row[col.columnName] || void 0;
       } else if (formatMap) {
         propsData.value = row[formatMap.value];
       } else {
@@ -1301,7 +1301,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
       updateAddCheckedRows(row);
     };
     const handlerClickRow = (data) => {
-      var _a, _b;
+      var _a, _b, _c;
       let {
         row,
         $event = {},
@@ -1342,8 +1342,9 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         nestHandleClickRow(table, data);
         return;
       }
+      const batchSelect = (_c = getAttr("checkbox-config")) == null ? void 0 : _c.batchSelect;
       let forbiddenBatchSelect = !checkMethod(data);
-      if (state.selectType == "checkbox" && (forbiddenBatchSelect || data.row.$__SEPARATE)) {
+      if (state.selectType == "checkbox" && !batchSelect && (forbiddenBatchSelect || data.row.$__SEPARATE)) {
         table == null ? void 0 : table.setAllCheckboxRow(false);
         const checked2 = getRowClassName({
           row
@@ -1407,7 +1408,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
           rowLen = checkedRow.filter((item) => !XEUtils.has(item, GROUP_TITLE_KEY)).length;
         }
       }
-      table.setAllCheckboxRow(false);
+      !batchSelect && table.setAllCheckboxRow(false);
       let setChecked = checked;
       if (rowLen > 1) {
         state.selectType != "radio" && table.setCheckboxRow([row], true);
@@ -2309,10 +2310,7 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         "mouse-config": {
           selected: ((_a = _ctx.columnConfig.keyboardConfig) == null ? void 0 : _a.isEdit) ? true : false
         },
-        "tree-config": {
-          ...unref(treeConfig) || {},
-          ...unref(getAttr)("tree-config")
-        },
+        "tree-config": unref(treeConfig),
         "row-class-name": getRowClassName,
         "row-config": {
           ...state.rowConfig,

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

@@ -35,7 +35,7 @@ var EditInput = defineComponent({
     const {
       formRef
     } = useCommon(props, attrs);
-    const __value = ref(attrs.value);
+    const __value = ref(props.type === "number" ? attrs.value || void 0 : attrs.value);
     const commData = {
       row: props.row,
       column: props.col,

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

@@ -33,7 +33,7 @@ var EditSelect = defineComponent({
     const {
       formRef,
       isShow
-    } = useCommon(props, attrs);
+    } = useCommon(props, attrs, true);
     const state = reactive({
       options: [],
       loading: false,

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

@@ -80,12 +80,14 @@ var EditTime = defineComponent({
         }
         return false;
       };
+      const isTime = (curTime) => {
+        const arr = curTime.split(":");
+        return +arr[0] * 60 * 60 + +arr[1] * 60 + (arr[3] ? +arr[3] : 0) < 24 * 60 * 60;
+      };
       if (!isValid(time)) {
         if (!isNaN(time) && (/^\d{4}$/.test(time) || /^\d{6}$/.test(time))) {
           const curTime = getFormatTime(time);
-          if (isValid(curTime)) {
-            time = curTime;
-          }
+          time = isValid(curTime) && isTime(curTime) ? curTime : "";
         } else {
           time = "";
         }

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

@@ -1,4 +1,5 @@
-export declare const useCommon: (props: any, attrs: any) => {
+import { AnyObject } from '../../../../../../es/shared/types';
+export declare const useCommon: (props: AnyObject, attrs: AnyObject, isTriggerClick?: boolean) => {
     formRef: import("vue").Ref<HTMLElement | null>;
     isShow: import("vue").Ref<boolean>;
 };

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

@@ -1,12 +1,16 @@
 import { ref, onMounted } from 'vue';
 
-const useCommon = (props, attrs) => {
+const useCommon = (props, attrs, isTriggerClick = false) => {
   const formRef = ref(null);
   const isShow = ref(false);
   onMounted(() => {
-    var _a;
+    var _a, _b, _c;
     if (attrs.editTrigger !== "manual") {
-      (_a = formRef.value) == null ? void 0 : _a.focus();
+      if (isTriggerClick) {
+        (_b = (_a = formRef.value) == null ? void 0 : _a.handleTriggerClick) == null ? void 0 : _b.call(_a);
+      } else {
+        (_c = formRef.value) == null ? void 0 : _c.focus();
+      }
       isShow.value = true;
     }
   });

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

@@ -494,7 +494,7 @@ const useFormat = (state, attr) => {
     const newField = field.replace(/-(\w)/g, ($0, $1) => {
       return $1.toUpperCase();
     });
-    return attr[newField] || {};
+    return attr[newField] || null;
   }
   return {
     formatData,

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

@@ -60,6 +60,10 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
         default: string;
         type: StringConstructor;
     };
+    btnprint: {
+        type: StringConstructor;
+        default: string;
+    };
 }, {
     $message: import("naive-ui").MessageApi;
     printInstance: any;
@@ -122,6 +126,10 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
             default: string;
             type: StringConstructor;
         };
+        btnprint: {
+            type: StringConstructor;
+            default: string;
+        };
     }>> & {
         onError?: ((...args: any[]) => any) | undefined;
         onSuccess?: ((...args: any[]) => any) | undefined;
@@ -1869,6 +1877,10 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
         default: string;
         type: StringConstructor;
     };
+    btnprint: {
+        type: StringConstructor;
+        default: string;
+    };
 }>> & {
     onError?: ((...args: any[]) => any) | undefined;
     onSuccess?: ((...args: any[]) => any) | undefined;
@@ -1887,5 +1899,6 @@ declare const ButtonPrint: SFCWithInstall<import("vue").DefineComponent<{
     clickPrevFn: Function;
     noDataMsg: string;
     printdlgshow: string;
+    btnprint: string;
 }>>;
 export default ButtonPrint;

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

@@ -61,6 +61,10 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
         type: StringConstructor;
     };
+    btnprint: {
+        type: StringConstructor;
+        default: string;
+    };
 }, {
     $message: import("naive-ui").MessageApi;
     printInstance: any;
@@ -126,6 +130,10 @@ declare const _default: import("vue").DefineComponent<{
             default: string;
             type: StringConstructor;
         };
+        btnprint: {
+            type: StringConstructor;
+            default: string;
+        };
     }>> & {
         onError?: ((...args: any[]) => any) | undefined;
         onSuccess?: ((...args: any[]) => any) | undefined;
@@ -1876,6 +1884,10 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
         type: StringConstructor;
     };
+    btnprint: {
+        type: StringConstructor;
+        default: string;
+    };
 }>> & {
     onError?: ((...args: any[]) => any) | undefined;
     onSuccess?: ((...args: any[]) => any) | undefined;
@@ -1894,5 +1906,6 @@ declare const _default: import("vue").DefineComponent<{
     clickPrevFn: Function;
     noDataMsg: string;
     printdlgshow: string;
+    btnprint: string;
 }>;
 export default _default;

package/es/components/button-print/src/ButtonPrint.vue2.js

@@ -67,6 +67,10 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
     printdlgshow: {
       default: "0",
       type: String
+    },
+    btnprint: {
+      type: String,
+      default: "1"
     }
   },
   emits: ["success", "error", "clickoutside"],
@@ -196,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)
@@ -222,7 +228,8 @@ var _sfc_main = /* @__PURE__ */ defineComponent({
         const queryParams = {
           formatId: state.currentFormatId,
           templateId: getTemplateIdByFormatId.value,
-          params
+          params,
+          btnprint: props.btnprint
         };
         printInstance.preview(queryParams, (res) => {
           callLocalServicesSuccessCb(res, "preview");

package/es/components/button-print/src/utils/print.d.ts

@@ -33,10 +33,10 @@ export declare class Print {
         pageCount: any;
         formatId: string;
     };
-    _handleEventDirect({ templateId, formatId, params, cmdid, print, printdlgshow, nobillnode }: AnyObject): Promise<any>;
+    _handleEventDirect({ templateId, formatId, params, cmdid, print, printdlgshow, nobillnode, btnprint }: AnyObject): Promise<any>;
     _handleEventEditFormat({ templateId, formatId, params, token }: AnyObject): Promise<any>;
     _queryPrintFile(formatId: string, params?: string): Promise<any>;
-    preview({ templateId, formatId, params }: AnyObject, successCallbackFn?: Func, errorCallbackFn?: Func): Promise<any>;
+    preview({ templateId, formatId, params, btnprint }: AnyObject, successCallbackFn?: Func, errorCallbackFn?: Func): Promise<any>;
     printDirect({ templateId, formatId, params, print, printdlgshow, nobillnode }: AnyObject, successCallbackFn: Func, errorCallbackFn: Func, mode?: string): Promise<any>;
     private _downloadPDF;
     /**

package/es/components/button-print/src/utils/print.js

@@ -197,7 +197,8 @@ class Print {
     cmdid,
     print,
     printdlgshow = "1",
-    nobillnode = "1"
+    nobillnode = "1",
+    btnprint = "1"
   }) {
     const queryParams = {
       templateId,
@@ -205,7 +206,8 @@ class Print {
       params,
       cmdid,
       nobillnode,
-      printdlgshow
+      printdlgshow,
+      btnprint
     };
     if (print) {
       try {
@@ -245,7 +247,7 @@ class Print {
     }) || {};
     return data;
   }
-  async preview({ templateId, formatId, params = "" }, successCallbackFn, errorCallbackFn) {
+  async preview({ templateId, formatId, params = "", btnprint }, successCallbackFn, errorCallbackFn) {
     if (isIReport(formatId)) {
       const data = await this._queryPrintFile(formatId, params);
       if (!data)
@@ -264,7 +266,8 @@ class Print {
       templateId,
       formatId,
       params,
-      cmdid: PREVIEW_CMD_ID
+      cmdid: PREVIEW_CMD_ID,
+      btnprint
     });
     if (!result)
       return false;