@epie/bi-crud 2.0.9 → 2.0.12

package/README.md

@@ -122,7 +122,7 @@ export default {
   							// 分页信息
   							pagination: {
   								total: 8,
-  								size: 20,
+  								pageSize: 20,
   								page: 1
   							}
   						})
@@ -192,7 +192,7 @@ export default {
   							advSearch: "高级搜索",
   							saveButtonText: "保存",
   							closeButtonText: "关闭",
-								doExport: "导出",
+								export: "导出",
   						}
   					},
   				})

package/lib/bi-crud.esm.js

@@ -14824,7 +14824,7 @@ function useHelper(_ref) {
                       resolve(res);
                       done();
                     }).catch(function (err) {
-                      ElMessage.error(err.message);
+                      ElMessage.error(err.msg);
                       reject(err);
                       done();
                     });
@@ -14864,14 +14864,6 @@ function useHelper(_ref) {
     mitt.emit("crud.proxy", {
       name: "add"
     });
-  } // 导出当前结果
-
-
-  function doExport(callback) {
-    mitt.emit("crud.proxy", {
-      name: "export",
-      callback: callback
-    });
   } // 打开编辑
 
 
@@ -14942,7 +14934,7 @@ function useHelper(_ref) {
               ElMessage.success("删除成功");
               resolve(res);
             }).catch(function (err) {
-              ElMessage.error(err.message);
+              ElMessage.error(err.msg);
               reject(err);
             });
           }
@@ -15022,7 +15014,6 @@ function useHelper(_ref) {
     rowDelete: rowDelete,
     rowClose: rowClose,
     refresh: refresh,
-    doExport: doExport,
     rowDescription: rowDescription,
     getPermission: getPermission,
     paramsReplace: paramsReplace,
@@ -15154,7 +15145,8 @@ var Crud$1 = defineComponent({
           update: "update",
           delete: "delete",
           info: "info",
-          page: "page"
+          page: "page",
+          export: "export"
         },
         pagination: {
           page: "page",
@@ -15175,7 +15167,7 @@ var Crud$1 = defineComponent({
           update: "编辑",
           refresh: "刷新",
           advSearch: "高级搜索",
-          doExport: "导出"
+          export: "导出"
         }
       },
       // 权限
@@ -15732,7 +15724,7 @@ function parseNode(vnode, options) {
     };
   }
 
-  if (vnode.name === "el-select" && props.clearable) {
+  if (["el-select", "el-input"].includes(vnode.name) && props.clearable) {
     props["onClear"] = function () {
       scope[prop] = undefined;
     };
@@ -17511,7 +17503,11 @@ var RefreshBtn = defineComponent({
 
 var ExportBtn = defineComponent({
   name: "epie-export-btn",
-  setup: function setup(_, _ref) {
+  props: {
+    // 导出钩子
+    onExport: Function
+  },
+  setup: function setup(props, _ref) {
     var _crud$dict$label;
 
     var slots = _ref.slots;
@@ -17520,15 +17516,97 @@ var ExportBtn = defineComponent({
         crud = _useCore.crud;
 
     var exportVisible = ref(false);
-    var exportLoading = ref(false);
+    var exportLoading = ref(false); // 根据字典替换请求参数
+
+    function paramsReplaceExport(params) {
+      var _crud$dict = crud.dict,
+          pagination = _crud$dict.pagination,
+          search = _crud$dict.search,
+          sort = _crud$dict.sort; // 请求参数
+
+      var a = _objectSpread2({}, params); // 字典
+
+
+      var b = _objectSpread2(_objectSpread2(_objectSpread2({}, pagination), search), sort);
+
+      for (var i in b) {
+        if (a[i]) {
+          if (i != b[i]) {
+            a["_".concat(b[i])] = a[i];
+            delete a[i];
+          }
+        }
+      }
+
+      for (var _i in a) {
+        if (_i[0] === "_") {
+          a[_i.substr(1)] = a[_i];
+          delete a[_i];
+        }
+      }
+
+      return a;
+    }
 
     var onExport = function onExport() {
-      exportLoading.value = true;
-      console.log("onExport");
-      setTimeout(function () {
-        exportLoading.value = false;
-        exportVisible.value = false;
-      }, 2000);
+      return new Promise(function (r1) {
+        exportLoading.value = true;
+
+        function done() {
+          exportLoading.value = false;
+          exportVisible.value = false;
+          r1(true);
+        }
+
+        function nextExport(res) {
+          if (res && res.code === 0) {
+            ElMessage({
+              type: 'success',
+              message: '导出成功'
+            });
+            window.open(res.data);
+          } else {
+            ElMessage({
+              type: 'error',
+              message: "\u5BFC\u51FA\u5931\u8D25 ".concat(res.msg)
+            });
+          }
+
+          done();
+        }
+
+        function next() {
+          return new Promise(function (resolve, reject) {
+            var reqName = crud.dict.api["export"] || ""; // 验证请求
+
+            if (!crud.service[reqName]) {
+              done();
+              return reject("[\u914D\u7F6E] Service \u4E2D\u4E0D\u5B58\u5728 ".concat(reqName, " \u65B9\u6CD5"));
+            }
+
+            var data = paramsReplaceExport(crud.getParams()); // 发送请求
+
+            crud.service[reqName](data).then(function (res) {
+              if (props.onExport) {
+                props.onExport(res, {
+                  done: done
+                });
+              } else {
+                nextExport(res);
+                resolve(res);
+              }
+            }).catch(function (err) {
+              ElMessage.error(err.msg);
+              done();
+              reject(err);
+            });
+          });
+        }
+
+        next().catch(function (err) {
+          ElMessage.error(err);
+        });
+      });
     };
 
     var hasPermission = crud.getPermission("export");
@@ -17537,7 +17615,7 @@ var ExportBtn = defineComponent({
       exportVisible: exportVisible,
       exportLoading: exportLoading,
       onExport: onExport,
-      label: (_crud$dict$label = crud.dict.label) === null || _crud$dict$label === void 0 ? void 0 : _crud$dict$label.doExport,
+      label: (_crud$dict$label = crud.dict.label) === null || _crud$dict$label === void 0 ? void 0 : _crud$dict$label.export,
       slots: slots
     };
   },
@@ -17552,7 +17630,7 @@ var ExportBtn = defineComponent({
       visible: ctx.exportVisible
     }, {
       default: function _default() {
-        return createVNode(Fragment, null, [createVNode("p", null, [createTextVNode("\u5373\u5C06\u6309\u7167\u641C\u7D22\u6761\u4EF6\u5BFC\u51FA")]), createVNode("div", {
+        return createVNode(Fragment, null, [createVNode("p", null, [createTextVNode("\u5373\u5C06\u6309\u7167\u6700\u8FD1\u4E00\u6B21\u67E5\u8BE2\u6761\u4EF6\u5BFC\u51FA")]), createVNode("div", {
           "style": "text-align: right; margin-top: 8px;"
         }, [createVNode(resolveComponent("el-button"), {
           "size": "small",
@@ -18743,7 +18821,7 @@ var Upsert = defineComponent({
             crud.refresh();
             resolve(res);
           }).catch(function (err) {
-            ElMessage.error(err.message);
+            ElMessage.error(err.msg);
             done();
             reject(err);
           });
@@ -18959,7 +19037,7 @@ var Upsert = defineComponent({
                       done(res.data);
                       resolve(res.data);
                     }).catch(function (err) {
-                      ElMessage.error(err.message);
+                      ElMessage.error(err.msg);
                       reject(err);
                     });
 
@@ -19455,8 +19533,7 @@ function useRender$1(ctx) {
       e._hidden = Parse("hidden", {
         value: e.hidden,
         scope: ctx.form
-      });
-      console.log("children is ".concat(e)); // 隐藏
+      }); // 隐藏
 
       if (e._hidden) {
         return null;

package/lib/bi-crud.umd.js

@@ -14827,7 +14827,7 @@
                         resolve(res);
                         done();
                       }).catch(function (err) {
-                        elementPlus.ElMessage.error(err.message);
+                        elementPlus.ElMessage.error(err.msg);
                         reject(err);
                         done();
                       });
@@ -14867,14 +14867,6 @@
       mitt.emit("crud.proxy", {
         name: "add"
       });
-    } // 导出当前结果
-
-
-    function doExport(callback) {
-      mitt.emit("crud.proxy", {
-        name: "export",
-        callback: callback
-      });
     } // 打开编辑
 
 
@@ -14945,7 +14937,7 @@
                 elementPlus.ElMessage.success("删除成功");
                 resolve(res);
               }).catch(function (err) {
-                elementPlus.ElMessage.error(err.message);
+                elementPlus.ElMessage.error(err.msg);
                 reject(err);
               });
             }
@@ -15025,7 +15017,6 @@
       rowDelete: rowDelete,
       rowClose: rowClose,
       refresh: refresh,
-      doExport: doExport,
       rowDescription: rowDescription,
       getPermission: getPermission,
       paramsReplace: paramsReplace,
@@ -15157,7 +15148,8 @@
             update: "update",
             delete: "delete",
             info: "info",
-            page: "page"
+            page: "page",
+            export: "export"
           },
           pagination: {
             page: "page",
@@ -15178,7 +15170,7 @@
             update: "编辑",
             refresh: "刷新",
             advSearch: "高级搜索",
-            doExport: "导出"
+            export: "导出"
           }
         },
         // 权限
@@ -15735,7 +15727,7 @@
       };
     }
 
-    if (vnode.name === "el-select" && props.clearable) {
+    if (["el-select", "el-input"].includes(vnode.name) && props.clearable) {
       props["onClear"] = function () {
         scope[prop] = undefined;
       };
@@ -17514,7 +17506,11 @@
 
   var ExportBtn = vue.defineComponent({
     name: "epie-export-btn",
-    setup: function setup(_, _ref) {
+    props: {
+      // 导出钩子
+      onExport: Function
+    },
+    setup: function setup(props, _ref) {
       var _crud$dict$label;
 
       var slots = _ref.slots;
@@ -17523,15 +17519,97 @@
           crud = _useCore.crud;
 
       var exportVisible = vue.ref(false);
-      var exportLoading = vue.ref(false);
+      var exportLoading = vue.ref(false); // 根据字典替换请求参数
+
+      function paramsReplaceExport(params) {
+        var _crud$dict = crud.dict,
+            pagination = _crud$dict.pagination,
+            search = _crud$dict.search,
+            sort = _crud$dict.sort; // 请求参数
+
+        var a = _objectSpread2({}, params); // 字典
+
+
+        var b = _objectSpread2(_objectSpread2(_objectSpread2({}, pagination), search), sort);
+
+        for (var i in b) {
+          if (a[i]) {
+            if (i != b[i]) {
+              a["_".concat(b[i])] = a[i];
+              delete a[i];
+            }
+          }
+        }
+
+        for (var _i in a) {
+          if (_i[0] === "_") {
+            a[_i.substr(1)] = a[_i];
+            delete a[_i];
+          }
+        }
+
+        return a;
+      }
 
       var onExport = function onExport() {
-        exportLoading.value = true;
-        console.log("onExport");
-        setTimeout(function () {
-          exportLoading.value = false;
-          exportVisible.value = false;
-        }, 2000);
+        return new Promise(function (r1) {
+          exportLoading.value = true;
+
+          function done() {
+            exportLoading.value = false;
+            exportVisible.value = false;
+            r1(true);
+          }
+
+          function nextExport(res) {
+            if (res && res.code === 0) {
+              elementPlus.ElMessage({
+                type: 'success',
+                message: '导出成功'
+              });
+              window.open(res.data);
+            } else {
+              elementPlus.ElMessage({
+                type: 'error',
+                message: "\u5BFC\u51FA\u5931\u8D25 ".concat(res.msg)
+              });
+            }
+
+            done();
+          }
+
+          function next() {
+            return new Promise(function (resolve, reject) {
+              var reqName = crud.dict.api["export"] || ""; // 验证请求
+
+              if (!crud.service[reqName]) {
+                done();
+                return reject("[\u914D\u7F6E] Service \u4E2D\u4E0D\u5B58\u5728 ".concat(reqName, " \u65B9\u6CD5"));
+              }
+
+              var data = paramsReplaceExport(crud.getParams()); // 发送请求
+
+              crud.service[reqName](data).then(function (res) {
+                if (props.onExport) {
+                  props.onExport(res, {
+                    done: done
+                  });
+                } else {
+                  nextExport(res);
+                  resolve(res);
+                }
+              }).catch(function (err) {
+                elementPlus.ElMessage.error(err.msg);
+                done();
+                reject(err);
+              });
+            });
+          }
+
+          next().catch(function (err) {
+            elementPlus.ElMessage.error(err);
+          });
+        });
       };
 
       var hasPermission = crud.getPermission("export");
@@ -17540,7 +17618,7 @@
         exportVisible: exportVisible,
         exportLoading: exportLoading,
         onExport: onExport,
-        label: (_crud$dict$label = crud.dict.label) === null || _crud$dict$label === void 0 ? void 0 : _crud$dict$label.doExport,
+        label: (_crud$dict$label = crud.dict.label) === null || _crud$dict$label === void 0 ? void 0 : _crud$dict$label.export,
         slots: slots
       };
     },
@@ -17555,7 +17633,7 @@
         visible: ctx.exportVisible
       }, {
         default: function _default() {
-          return vue.createVNode(vue.Fragment, null, [vue.createVNode("p", null, [vue.createTextVNode("\u5373\u5C06\u6309\u7167\u641C\u7D22\u6761\u4EF6\u5BFC\u51FA")]), vue.createVNode("div", {
+          return vue.createVNode(vue.Fragment, null, [vue.createVNode("p", null, [vue.createTextVNode("\u5373\u5C06\u6309\u7167\u6700\u8FD1\u4E00\u6B21\u67E5\u8BE2\u6761\u4EF6\u5BFC\u51FA")]), vue.createVNode("div", {
             "style": "text-align: right; margin-top: 8px;"
           }, [vue.createVNode(vue.resolveComponent("el-button"), {
             "size": "small",
@@ -18746,7 +18824,7 @@
               crud.refresh();
               resolve(res);
             }).catch(function (err) {
-              elementPlus.ElMessage.error(err.message);
+              elementPlus.ElMessage.error(err.msg);
               done();
               reject(err);
             });
@@ -18962,7 +19040,7 @@
                         done(res.data);
                         resolve(res.data);
                       }).catch(function (err) {
-                        elementPlus.ElMessage.error(err.message);
+                        elementPlus.ElMessage.error(err.msg);
                         reject(err);
                       });
 
@@ -19458,8 +19536,7 @@
         e._hidden = Parse("hidden", {
           value: e.hidden,
           scope: ctx.form
-        });
-        console.log("children is ".concat(e)); // 隐藏
+        }); // 隐藏
 
         if (e._hidden) {
           return null;

package/lib/components/crud/helper.d.ts

@@ -9,7 +9,6 @@ export declare function useHelper({ mitt, props, crud }: any): {
     rowDelete: (...selection: any[]) => void;
     rowClose: () => void;
     refresh: (params?: any) => Promise<unknown>;
-    doExport: (callback: Function) => void;
     rowDescription: (data: any) => void;
     getPermission: (key: "page" | "list" | "info" | "update" | "add" | "delete") => boolean;
     paramsReplace: (params: any) => any;

package/lib/components/crud/index.d.ts

@@ -28,6 +28,7 @@ declare const _default: import("vue").DefineComponent<{
             delete?: string | undefined;
             info?: string | undefined;
             page?: string | undefined;
+            export?: string | undefined;
         } | undefined;
         pagination?: {
             page?: string | undefined;
@@ -48,7 +49,7 @@ declare const _default: import("vue").DefineComponent<{
             update?: string | undefined;
             refresh?: string | undefined;
             advSearch?: string | undefined;
-            doExport?: string | undefined;
+            export?: string | undefined;
         } | undefined;
     };
     service: {
@@ -77,7 +78,7 @@ declare const _default: import("vue").DefineComponent<{
     refresh: (params?: {
         [key: string]: any;
         page?: number | undefined;
-        size?: number | undefined;
+        pageSize?: number | undefined;
         keyWord?: string | undefined;
     } | undefined) => Promise<{
         [key: string]: any;

package/lib/components/export-btn.d.ts

@@ -1,11 +1,15 @@
-declare const _default: import("vue").DefineComponent<{}, {
+declare const _default: import("vue").DefineComponent<{
+    onExport: FunctionConstructor;
+}, {
     hasPermission: boolean;
     exportVisible: import("vue").Ref<boolean>;
     exportLoading: import("vue").Ref<boolean>;
-    onExport: () => void;
+    onExport: () => Promise<unknown>;
     label: string | undefined;
     slots: Readonly<{
         [name: string]: import("vue").Slot | undefined;
     }>;
-}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, import("vue").EmitsOptions, 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<{
+    onExport: FunctionConstructor;
+}>>, {}>;
 export default _default;

package/lib/types/base/crud.d.ts

@@ -8,6 +8,7 @@ export declare namespace EpieCrud {
             delete?: string;
             info?: string;
             page?: string;
+            export?: string;
         };
         pagination?: {
             page?: string;
@@ -28,7 +29,7 @@ export declare namespace EpieCrud {
             update?: string;
             refresh?: string;
             advSearch?: string;
-            doExport?: string | undefined;
+            export?: string | undefined;
         };
     }
     interface Permission {
@@ -54,7 +55,7 @@ export declare namespace EpieCrud {
         page: {
             params: {
                 page?: number;
-                size?: number;
+                pageSize?: number;
                 keyWord?: string;
                 [key: string]: any;
             };

package/lib/utils/test.d.ts

@@ -20,4 +20,8 @@ export declare const TestService: {
     add: (d: any) => Promise<void>;
     delete: (d: any) => Promise<void>;
     update: (d: any) => Promise<void>;
+    export: (d: any) => Promise<{
+        code: number;
+        data: string;
+    }>;
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@epie/bi-crud",
   "simpleName": "bi-crud",
-  "version": "2.0.9",
+  "version": "2.0.12",
   "private": false,
   "main": "lib/bi-crud.umd.js",
   "module": "lib/bi-crud.esm.js",