@hzab/list-render 0.1.3 → 0.1.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/list-render",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "",
   "main": "lib",
   "scripts": {
@@ -19,6 +19,7 @@
   "author": "CaiYansong",
   "license": "ISC",
   "devDependencies": {
+    "@hzab/data-model": "^0.0.3",
     "@hzab/webpack-config": "0.0.12",
     "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.9",

package/src/data-model.js

@@ -39,6 +39,33 @@ class DataModel {
     this.updateMap = updateMap;
     this.deleteApi = deleteApi;
     this.multipleDeleteApi = multipleDeleteApi;
+
+    const {
+      getListReqMap,
+      getListResMap,
+      getReqMap,
+      getResMap,
+      createReqMap,
+      createResMap,
+      updateReqMap,
+      updateResMap,
+      deleteReqMap,
+      deleteResMap,
+      multipleDeleteReqMap,
+      multipleDeleteResMap,
+    } = params || {};
+    this.getListReqMap = getListReqMap;
+    this.getListResMap = getListResMap;
+    this.getReqMap = getReqMap;
+    this.getResMap = getResMap;
+    this.createReqMap = createReqMap;
+    this.createResMap = createResMap;
+    this.updateReqMap = updateReqMap;
+    this.updateResMap = updateResMap;
+    this.deleteReqMap = deleteReqMap;
+    this.deleteResMap = deleteResMap;
+    this.multipleDeleteReqMap = multipleDeleteReqMap;
+    this.multipleDeleteResMap = multipleDeleteResMap;
   }
 
   getApiUrl(api, record, ctx = this.ctx) {
@@ -59,6 +86,10 @@ class DataModel {
     let query = _.merge({}, this.query, q);
     query = _.pickBy(query, (val) => !_.isNil(val) && val !== "");
 
+    if (this.getReqMap) {
+      query = this.getReqMap(query);
+    }
+
     return new Promise((resolve, reject) => {
       const apiUrl = this.getApiUrl(this.getApi, query, ctx);
       this.axios
@@ -73,6 +104,9 @@ class DataModel {
               if (this.getMap) {
                 res = this.getMap(res);
               }
+              if (this.getResMap) {
+                res = this.getResMap(res);
+              }
               resolve(res);
             },
             reject,
@@ -86,6 +120,10 @@ class DataModel {
     let query = _.merge({}, this.query, q);
     query = _.pickBy(query, (val) => !_.isNil(val) && val !== "");
 
+    if (this.getListReqMap) {
+      query = this.getListReqMap(query);
+    }
+
     let resultList = null;
     if (this.getListFunc) {
       resultList = await this.getListFunc(query);
@@ -105,6 +143,9 @@ class DataModel {
                 if (this.getListMap) {
                   res.list = res.list.map((record) => this.getListMap(record));
                 }
+                if (this.getListResMap) {
+                  res = this.getListResMap(res);
+                }
                 resolve(res);
               },
               reject,
@@ -118,56 +159,108 @@ class DataModel {
   }
 
   create(params, ctx) {
+    let _params = _.cloneDeep(params);
+    if (this.createReqMap) {
+      _params = this.createReqMap(_params);
+    }
     return new Promise((resolve, reject) => {
-      const apiUrl = this.getApiUrl(this.createApi, params, ctx);
+      const apiUrl = this.getApiUrl(this.createApi, _params, ctx);
       const opt = { ...this.axiosConf };
-      if (params instanceof FormData) {
+      if (_params instanceof FormData) {
         opt.headers = { "Content-Type": "multipart/form-data" };
       }
       this.axios
-        .post(apiUrl, params, opt)
+        .post(apiUrl, _params, opt)
         .then((response) => {
-          this.handleRes(response, resolve, reject);
+          this.handleRes(
+            response,
+            (res) => {
+              if (this.createResMap) {
+                res = this.createResMap(res);
+              }
+              resolve(res);
+            },
+            reject,
+          );
         })
         .catch((err) => this.errorHandler(err, reject));
     });
   }
 
   update(params, ctx) {
+    let _params = _.cloneDeep(params);
+    if (this.updateReqMap) {
+      _params = this.updateReqMap(_params);
+    }
     return new Promise((resolve, reject) => {
-      const apiUrl = this.getApiUrl(this.updateApi, params, ctx);
+      const apiUrl = this.getApiUrl(this.updateApi, _params, ctx);
       const opt = { ...this.axiosConf };
-      if (params instanceof FormData) {
+      if (_params instanceof FormData) {
         opt.headers = { "Content-Type": "multipart/form-data" };
       }
       this.axios
-        .put(apiUrl, params, opt)
+        .put(apiUrl, _params, opt)
         .then((response) => {
-          this.handleRes(response, resolve, reject);
+          this.handleRes(
+            response,
+            (res) => {
+              if (this.updateResMap) {
+                res = this.updateResMap(res);
+              }
+              resolve(res);
+            },
+            reject,
+          );
         })
         .catch((err) => this.errorHandler(err, reject));
     });
   }
 
   delete(params, ctx) {
+    let _params = _.cloneDeep(params);
+    if (this.deleteReqMap) {
+      _params = this.deleteReqMap(_params);
+    }
     return new Promise((resolve, reject) => {
-      const apiUrl = this.getApiUrl(this.deleteApi, params, ctx);
+      const apiUrl = this.getApiUrl(this.deleteApi, _params, ctx);
       this.axios
-        .delete(apiUrl, { ...this.axiosConf, ...params })
+        .delete(apiUrl, { ...this.axiosConf, ..._params })
         .then((response) => {
-          this.handleRes(response, resolve, reject);
+          this.handleRes(
+            response,
+            (res) => {
+              if (this.deleteResMap) {
+                res = this.deleteResMap(res);
+              }
+              resolve(res);
+            },
+            reject,
+          );
         })
         .catch((err) => this.errorHandler(err, reject));
     });
   }
 
   multipleDelete(params, ctx) {
+    let _params = _.cloneDeep(params);
+    if (this.multipleDeleteReqMap) {
+      _params = this.multipleDeleteReqMap(_params);
+    }
     return new Promise((resolve, reject) => {
-      const apiUrl = this.getApiUrl(this.multipleDeleteApi, params, ctx);
+      const apiUrl = this.getApiUrl(this.multipleDeleteApi, _params, ctx);
       this.axios
-        .delete(apiUrl, { ...this.axiosConf, ...params })
+        .delete(apiUrl, { ...this.axiosConf, ..._params })
         .then((response) => {
-          this.handleRes(response, resolve, reject);
+          this.handleRes(
+            response,
+            (res) => {
+              if (this.multipleDeleteResMap) {
+                res = this.multipleDeleteResMap(res);
+              }
+              resolve(res);
+            },
+            reject,
+          );
         })
         .catch((err) => this.errorHandler(err, reject));
     });
@@ -189,6 +282,7 @@ class DataModel {
       if (_.isObject(_data) && _data.message === undefined) {
         // 前缀 _ 避免与 data 里已有的 message 冲突
         _data._message = message || msg;
+        _data._msg = message || msg;
       }
       resolve(_data);
     } else {
@@ -196,6 +290,7 @@ class DataModel {
       error.code = code;
       error.response = response;
       error._message = message || msg;
+      error._msg = message || msg;
       reject(error);
     }
   }
@@ -210,6 +305,7 @@ class DataModel {
       if (message) {
         // 前缀 _ 避免与 data 里已有的 message 冲突
         error._message = message;
+        error._msg = message;
       }
       return reject(error);
     }

package/src/index.js

@@ -1,5 +1,5 @@
 import ListRender from "./list-render.jsx";
 
-export * from "./data-model.js";
+export * from "@hzab/data-model";
 
 export default ListRender;

package/src/list-render.jsx

@@ -239,7 +239,6 @@ const ListRender = forwardRef(function (props, parentRef) {
         ref={formDialogRef}
         schema={schema}
         dialogConf={props.dialogConf}
-        formSlots={props.formSlots}
         formInitialValues={props.formInitialValues}
         onClose={props.onFormDialogClose}
         onSubmit={formState === "edit" ? onEditSubmit : onCreateSubmit}

package/src/pagination-render/index.jsx

@@ -7,7 +7,7 @@ const pageSizeOptions = [10, 20, 50, 100];
 
 function PaginationRender(props) {
   const [pageSize, setPageSize] = useState(
-    props.query?.pageSize || (props.pageSizeOptions ? props.pageSizeOptions[0] : pageSizeOptions[0]),
+    props.query?.pageSize || (props.config?.pageSizeOptions ? props.config?.pageSizeOptions[0] : pageSizeOptions[0]),
   );
   const [pageNum, setPageNumber] = useState(props.query?.pageNum || 1);
 
@@ -43,7 +43,7 @@ function PaginationRender(props) {
         current={pageNum}
         pageSize={pageSize}
         onChange={onChange}
-        pageSizeOptions={props.pageSizeOptions || pageSizeOptions}
+        pageSizeOptions={props.config?.pageSizeOptions || pageSizeOptions}
         total={props.total}
         showTotal={(total) => `总条数 ${total} 条`}
         showSizeChanger

package/src/table-render/index.jsx

@@ -111,7 +111,7 @@ function TableRender(props) {
     });
 
     if (props.hasAction !== false) {
-      const { hasEdit, hasDel } = props.config || {};
+      const { hasEdit, hasDel, hasDelTips } = props.config || {};
 
       const _colConf = props.config?.colConf?._$actions || {};
 
@@ -126,14 +126,14 @@ function TableRender(props) {
             return <Slots.tableActionsSlot {...slotProps} />;
           }
 
-          let _hasEdit = hasEdit !== false;
-          if (_hasEdit && typeof _colConf.hasEdit === "function") {
-            _hasEdit = _colConf.hasEdit(record, index);
-          }
-          let _hasDel = hasDel !== false;
-          if (_hasDel && typeof _colConf.hasDel === "function") {
-            _hasDel = _colConf.hasDel(record, index);
-          }
+          //编辑按钮权限
+          const _hasEdit = hasEdit && typeof hasEdit === "function" ? hasEdit(record, index) : hasEdit !== false;
+
+          //删除按钮权限
+          const _hasDel = hasDel && typeof hasDel === "function" ? hasEdit(record, index) : hasDel !== false;
+
+          //删除按钮提示
+          const delTips = hasDelTips && typeof hasDelTips === "function" ? hasDelTips(record, index) : hasDelTips || "确认删除该项?";
 
           return (
             <div style={{ width: _colConf?.width, maxWidth: "100%" }}>
@@ -152,7 +152,7 @@ function TableRender(props) {
               {_hasDel ? (
                 <Popconfirm
                   placement="topRight"
-                  title={"确认删除该项？"}
+                  title={delTips}
                   onConfirm={() => {
                     props.onDel && props.onDel(record, index);
                   }}