Merge branch 'develop'

kustomization/overlays/dev/kustomization.yaml

@@ -14,4 +14,4 @@ patches:
 images:
 - name: REGISTRY/NAMESPACE/IMAGE:TAG
   newName: mmc-registry.cn-shenzhen.cr.aliyuncs.com/sharefly-dev/admin
-  newTag: 01d77ad63c0e5a29390b7748dd9d32cbf85d15d5
+  newTag: c533f36fd07802ddc4791dbaaf1a0b66e0a38222

src/pages/mallManage/rentGoods/rentAddOrEditOrDetail/index.tsx

@@ -186,7 +186,11 @@ const GoodsAddOrEditOrDetail = () => {
           ...values.subImg.map((v: any) => ({
             imgType: 1,
             imgUrl: v.url,
-            id: goodsDetail ? goodsDetail.images.some((i) => i.id === v.id) : undefined,
+            id: goodsDetail
+              ? goodsDetail.images.some((i) => i.id === v.id)
+                ? v.id
+                : undefined
+              : undefined,
           })),
         );
       }

src/pages/mallManage/serviceManage/serviceList/index.tsx

-import React, { FC, useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import React, { FC, useEffect, useRef, useState } from 'react';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import { searchColumns } from '~/components/search-box';
 import SearchBox from '~/components/search-box';
 import AddOrEditServiceModal from './components/addOrEditServiceModal';
@@ -16,6 +16,7 @@ import { CategoryManageAPI, MallManageAPI } from '~/api';
 import { InterDataType, InterReqType, PaginationProps } from '~/api/interface';
 import { categoryListType } from '~/api/interface/categoryManage';
 import { serviceType } from '~/api/interface/mallManageType';
+import qs from 'query-string';
 
 //分类返回类型
 type categoryType = InterDataType<categoryListType>['list'];
@@ -25,7 +26,9 @@ type serviceListType = InterDataType<serviceType>['list'];
 type serviceParametersType = Omit<InterReqType<serviceType>, 'pageSize' | 'pageNo'>;
 
 const ServiceList: FC<any> = () => {
+  const searchRef = useRef<any>();
   const navigate = useNavigate();
+  const [searchParams, setSearchParams] = useSearchParams();
   const tabList = [
     {
       key: '1',
@@ -156,7 +159,11 @@ const ServiceList: FC<any> = () => {
 
   const onTabChange = (key: string) => {
     pagination.pageNo = 1;
+    pagination.pageSize = 10;
     setQuery({ ...query, displayState: key === '1' ? undefined : key === '2' ? 0 : 1 });
+    setSearchParams(
+      qs.stringify({ ...query, displayState: key === '1' ? 'all' : key === '2' ? 0 : 1 }),
+    );
     setActiveTabKey(key);
     getServiceList({ ...query, displayState: key === '1' ? undefined : key === '2' ? 0 : 1 });
   };
@@ -267,6 +274,14 @@ const ServiceList: FC<any> = () => {
   const paginationChange = (pageNo: number, pageSize: number) => {
     pagination.pageNo = pageNo;
     pagination.pageSize = pageSize;
+    setSearchParams(
+      qs.stringify({
+        ...query,
+        pageNo,
+        pageSize,
+        displayState: query.displayState === undefined ? 'all' : query.displayState,
+      }),
+    );
     getServiceList(query);
   };
   // 表格多选事件
@@ -276,6 +291,15 @@ const ServiceList: FC<any> = () => {
   //筛选
   const searchSuccess = (data: any) => {
     pagination.pageNo = 1;
+    pagination.pageSize = 10;
+    setSearchParams(
+      qs.stringify({
+        ...data,
+        pageNo: pagination.pageNo,
+        pageSize: pagination.pageSize,
+        displayState: query.displayState === undefined ? 'all' : query.displayState,
+      }),
+    );
     setQuery(data);
     getServiceList(data);
   };
@@ -288,7 +312,39 @@ const ServiceList: FC<any> = () => {
     setPreviewShow(false);
   };
   useEffect(() => {
-    getServiceList();
+    pagination.pageNo = Number(searchParams.get('pageNo') || 1);
+    pagination.pageSize = Number(searchParams.get('pageSize') || 10);
+    searchRef.current.getForm().setFieldsValue({
+      serviceName: searchParams.get('serviceName') || undefined,
+      applicationId: searchParams.get('applicationId')
+        ? Number(searchParams.get('applicationId'))
+        : undefined,
+      industryId: searchParams.get('industryId')
+        ? Number(searchParams.get('industryId'))
+        : undefined,
+    });
+    const queryObj = {
+      serviceName: searchParams.get('serviceName') || undefined,
+      applicationId: searchParams.get('applicationId')
+        ? Number(searchParams.get('applicationId'))
+        : undefined,
+      industryId: searchParams.get('industryId')
+        ? Number(searchParams.get('industryId'))
+        : undefined,
+      displayState:
+        searchParams.get('displayState') === 'all' || searchParams.get('displayState') === null
+          ? undefined
+          : Number(searchParams.get('displayState')),
+    };
+    setQuery(queryObj);
+    setActiveTabKey(
+      searchParams.get('displayState') === 'all' || searchParams.get('displayState') === null
+        ? '1'
+        : Number(searchParams.get('displayState')) === 0
+        ? '2'
+        : '3',
+    );
+    getServiceList(queryObj);
     getIndustryCategoryList();
     getApplicationCategoryList();
   }, []);
@@ -307,6 +363,7 @@ const ServiceList: FC<any> = () => {
           </Button>
         }
         searchData={searchSuccess}
+        baseRef={searchRef}
       />
       <Card tabList={tabList} activeTabKey={activeTabKey} onTabChange={onTabChange}>
         <div className='header-operate' style={{ marginBottom: '10px' }}>