@hzab/list-render 1.6.0 → 1.6.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/list-render",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "",
   "main": "src",
   "scripts": {

package/src/common/utils.js

@@ -89,7 +89,7 @@ export function getDateVal(val, format) {
   return dayjs(val).format(format);
 }
 
-export function getFieldList(_schema, fieldList = [], opt = {}) {
+export function getFieldList(_schema, fieldList = [], opt = {},isTableSortXIdex = false) {
   const schema = _schema?.schema || _schema;
 
   const { boxList = [] } = opt || {};
@@ -113,10 +113,11 @@ export function getFieldList(_schema, fieldList = [], opt = {}) {
         fieldList.push(field);
       }
     });
+  isTableSortXIdex && fieldList.sort((a, b) => a["x-index"] - b["x-index"]);
   return fieldList;
 }
 
-export function getFieldMap(_schema, fieldMap = {}, isTableSortXIdex = false) {
+export function getFieldMap(_schema, fieldMap = {}) {
   // const fieldMap = _.keyBy(getFieldList(_schema), "name");
   const schema = _schema?.schema || _schema;
   schema?.properties &&
@@ -131,7 +132,6 @@ export function getFieldMap(_schema, fieldMap = {}, isTableSortXIdex = false) {
       }
     });
 
-  isTableSortXIdex && fieldList.sort((a, b) => a["x-index"] - b["x-index"]);
   return fieldMap;
 }
 

package/src/list-render.jsx

@@ -35,6 +35,9 @@ const ListRender = forwardRef(function (props, parentRef) {
   const formDialogRef = useRef();
   const detailDialogRef = useRef();
   const queryRef = useRef();
+  const modelQueryRef = useRef({});
+  const formQueryRef = useRef({});
+  const paginationQueryRef = useRef({ pageNum: 1, pageSize: 10 });
 
   useImperativeHandle(parentRef, () => ({
     getList,
@@ -53,6 +56,8 @@ const ListRender = forwardRef(function (props, parentRef) {
     if (model) {
       if (!model.query) {
         model.query = {};
+      } else {
+        modelQueryRef.current = model?.query;
       }
       model.query.pageNum = 1;
     }
@@ -77,11 +82,11 @@ const ListRender = forwardRef(function (props, parentRef) {
     });
   };
 
-  function getList(query = model?.query || {}) {
+  function getList(query = modelQueryRef.current || {}) {
     if (!model?.getList && Array.isArray(props.list)) {
       setListLoading(true);
       const { list } = props;
-      const { pageNum = 1, pageSize = 10 } = model?.query || {};
+      const { pageNum = 1, pageSize = 10 } = modelQueryRef.current || {};
       setList(list.slice(pageSize * (pageNum - 1), pageNum * pageSize));
       setTotal(list.length);
       props.onGetListEnd && props.onGetListEnd({ list, pagination: { pageNum, pageSize } });
@@ -95,12 +100,26 @@ const ListRender = forwardRef(function (props, parentRef) {
 
     // remove $timerange
     const _q = _.cloneDeep(query);
-    if (_q.$timerange !== undefined) {
-      delete _q.$timerange;
+    const _q1 = _.cloneDeep(modelQueryRef.current);
+    const _q2 = _.cloneDeep(formQueryRef.current);
+    const _q3 = _.cloneDeep(paginationQueryRef.current);
+
+    const mergedQueries = {
+      ..._q,
+      ..._q1,
+      ..._q2,
+      ..._q3
+    };
+
+    if (mergedQueries.$timerange !== undefined) {
+      delete mergedQueries.$timerange;
     }
 
+    model.query = mergedQueries;
+
+
     model
-      ?.getList(_q)
+      ?.getList(mergedQueries)
       .then((res) => {
         setList(res.list);
         setTotal(res.pagination?.total);
@@ -118,19 +137,24 @@ const ListRender = forwardRef(function (props, parentRef) {
     if (model && !model.query) {
       model.query = {};
     }
-    model.query.pageNum = page;
-    model.query.pageSize = size;
+    // model.query.pageNum = page;
+    // model.query.pageSize = size;
+    paginationQueryRef.current = { pageNum: page, pageSize: size };
     getList();
   }
 
-  function onSearch(query) {
+  function onSearch(quer,source) {
+    const query = source === "queryRender" ? {...quer} :{...formQueryRef.current, ...quer};
     if (model && !model.query) {
       model.query = {};
     }
-    model.query.pageNum = 1;
+    // model.query.pageNum = 1;
+    paginationQueryRef.current = { ...paginationQueryRef.current, pageNum: 1 };
+
     if (model && model.query && !model.query.pageSize) {
       model.query.pageSize = 10;
     }
+    formQueryRef.current = query;
     model.query = Object.assign(model.query, query);
     getList(query);
   }
@@ -152,7 +176,7 @@ const ListRender = forwardRef(function (props, parentRef) {
     return model
       ?.create(_data)
       .then((res) => {
-        onSearch();
+        getList();
         message.success(res._message || "新增成功");
         props.onCreateSuc && props.onCreateSuc(res);
       })
@@ -254,7 +278,7 @@ const ListRender = forwardRef(function (props, parentRef) {
       .then((res) => {
         message.success(res._message || "删除成功");
         props.onDelSuc && props.onDelSuc(res);
-        onSearch();
+        getList();
       })
       .catch((err) => {
         handleMessage(err._message);
@@ -276,9 +300,9 @@ const ListRender = forwardRef(function (props, parentRef) {
             queryFormInitialValues={
               queryFormIsExtendModelQuery
                 ? {
-                    ...queryFormInitialValues,
-                    ...model.query,
-                  }
+                  ...queryFormInitialValues,
+                  ...model.query,
+                }
                 : queryFormInitialValues
             }
             onSearch={onSearch}
@@ -304,8 +328,8 @@ const ListRender = forwardRef(function (props, parentRef) {
         </div>
       </div>
       {Slots.HeaderOthersSuffix && (
-            <Slots.HeaderOthersSuffix  onSearch={onSearch} getList={getList} />
-          )}
+        <Slots.HeaderOthersSuffix onSearch={onSearch} getList={getList} />
+      )}
       <TableRender
         idKey={idKey}
         schema={schema?.schema}
@@ -330,7 +354,7 @@ const ListRender = forwardRef(function (props, parentRef) {
         <Pagination
           onChange={onPageChange}
           total={total}
-          query={model?.query}
+          query={{ ...model?.query, ...paginationQueryRef.current }}
           config={props.paginationConf}
           i18n={i18n}
         />

package/src/query-render/index.jsx

@@ -48,12 +48,12 @@ function QueryRender(props, parentRef) {
 
       if (!beforeQuerySearchResult) return;
     }
-    return props.onSearch && props.onSearch(query);
+    return props.onSearch && props.onSearch(query, 'queryRender');
   }
 
   function onReset() {
     formRef.current?.formRender?.reset();
-    props.onSearch && props.onSearch(_.cloneDeep(formRef?.current?.formRender?.values));
+    props.onSearch && props.onSearch(_.cloneDeep(formRef?.current?.formRender?.values), 'queryRender');
   }
 
   return (