fix

src/pages/Distributor/AppManage/index.tsx

@@ -51,7 +51,7 @@ const Page: React.FC = () => {
             search={{
                 labelWidth: 120,
             }}
-            scroll={{ x: "auto" }}
+            scroll={{ x: true }}
             params={{
                 appType: key
             }}

src/pages/Distributor/AppManage/tableConfig.tsx

@@ -109,7 +109,7 @@ export const columns = (props: { appType: any, setOpenTalbe: (v: any) => void })
             render: (_, record) => {
                 return <Space>
                     <a onClick={() => { props?.setOpenTalbe(record) }}>指派账号</a>
-                    <MenuChange menuType="miniApp" data={{ ...record, appType: props.appType }}><a type='primary'>管理</a></MenuChange>
+                    {/* <MenuChange menuType="miniApp" data={{ ...record, appType: props.appType }}><a type='primary'>管理</a></MenuChange> */}
                 </Space>
             },
         },

src/pages/Distributor/CorpManage/index.tsx

@@ -45,9 +45,9 @@ const Page: React.FC = () => {
             headerTitle={"企微列表"}
             rowKey={(r) => r.id}
             search={{
-                labelWidth: 120,
+                labelWidth: 90,
             }}
-            scroll={{ x: "auto" }}
+            scroll={{ x: true }}
             request={async (params) => {
                 return await getList.run(params)
             }}

src/pages/Distributor/CorpManage/popUp.tsx

@@ -50,7 +50,7 @@ const PopUp: React.FC<Props> = (props) => {
         <Drawer
             open={open}
             destroyOnClose
-            width={"35%"}
+            width={"50%"}
             onClose={() => { SetOpen(false) }}
         >
             <ProTable<any, any>
@@ -58,7 +58,8 @@ const PopUp: React.FC<Props> = (props) => {
                 headerTitle={`《${corpName}》通讯录列表`}
                 rowKey={(r) => r.corpUserId}
                 search={{
-                    labelWidth: 120,
+                    labelWidth: 100,
+                    span:12
                 }}
                 scroll={{ x: "auto" }}
                 request={async (params) => {

src/pages/Distributor/CorpManage/tableConfig.tsx

@@ -11,6 +11,8 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             dataIndex: 'corpName',
             key: "corpName",
             align: "center",
+            width:100,
+            ellipsis:true,
             fixed: 'left'
         },
         {
@@ -18,6 +20,8 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             dataIndex: 'corpId',
             key: "corpId",
             hideInSearch: true,
+            width:100,
+            ellipsis:true,
             align: "center",
         },
         {
@@ -26,6 +30,8 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             key: "corpType",
             hideInSearch: true,
             align: "center",
+            width:100,
+            ellipsis:true,
             valueEnum: getEnum("CORPTYPE", "map")
         },
         {
@@ -33,6 +39,8 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             dataIndex: 'corpUserMax',
             key: "corpUserMax",
             hideInSearch: true,
+            width:100,
+            ellipsis:true,
             align: "center",
         },
         {
@@ -40,6 +48,8 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             dataIndex: 'corpFullName',
             key: "corpFullName",
             hideInSearch: true,
+            width:100,
+            ellipsis:true,
             align: "center",
         },
         {
@@ -47,6 +57,8 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             dataIndex: 'verifiedEndTime',
             key: "verifiedEndTime",
             hideInSearch: true,
+            width:100,
+            ellipsis:true,
             align: "center",
         },
         {
@@ -55,6 +67,8 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             key: "subjectType",
             hideInSearch: true,
             align: "center",
+            width:100,
+            ellipsis:true,
             valueEnum: getEnum("SUBJECTTYPE", "map")
         },
         {
@@ -62,6 +76,8 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             dataIndex: 'corpScale',
             key: "corpScale",
             hideInSearch: true,
+            width:100,
+            ellipsis:true,
             align: "center",
         },
         {
@@ -69,6 +85,8 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             dataIndex: 'corpIndustry',
             key: "corpIndustry",
             hideInSearch: true,
+            width:100,
+            ellipsis:true,
             align: "center",
         },
         {
@@ -76,6 +94,8 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             dataIndex: 'corpSubIndustry',
             key: "corpSubIndustry",
             hideInSearch: true,
+            width:100,
+            ellipsis:true,
             align: "center",
         },
         {
@@ -83,6 +103,8 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             dataIndex: 'agentId',
             key: "agentId",
             hideInSearch: true,
+            width:100,
+            ellipsis:true,
             align: "center",
         },
         {
@@ -90,6 +112,8 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             dataIndex: 'authDistributorAccountId',
             key: "authDistributorAccountId",
             hideInSearch: true,
+            width:100,
+            ellipsis:true,
             align: "center",
         },
         {
@@ -97,6 +121,8 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             dataIndex: 'authStatus',
             key: "authStatus",
             align: "center",
+            width:100,
+            ellipsis:true,
             valueEnum(row) {
                 return { "1": { text: <Badge status="success" text="授权成功" /> }, "-1": { text: <Badge status="error" text="取消授权" /> } }
             },
@@ -107,6 +133,8 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             key: "createTime",
             hideInSearch: true,
             align: "center",
+            width:100,
+            ellipsis:true,
         },
         {
             title: "关注二维码",
@@ -115,7 +143,7 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             key: "corpWxQrcode",
             hideInSearch: true,
             align: "center",
-            fixed: 'right',
+            ellipsis:true,
             width: 120,
             render: (_, row) => {
                 return <Image src={row?.corpWxQrcode} style={{ width: 20 }} />
@@ -126,7 +154,6 @@ export const columns = (sync: (id: any) => void): ProColumns<any>[] => {
             dataIndex: 'option',
             valueType: 'option',
             align: "center",
-            fixed: 'right',
             width: 90,
             render: (_, record) => {
                 return <Space>

src/pages/MiniApp/BookManage/Long/index.tsx

@@ -160,7 +160,7 @@ const Page: React.FC = (props: Props) => {
             headerTitle={"小说列表"}
             rowKey={(r) => r.bookId}
             scroll={{ x: true, y: 500 }}
-            tableAlertRender={() => {
+            tableAlertRender={!!props?.onChange ? false : () => {
                 let { paymentType, paymentOption, paymentCategory, paymentAmount, paymentCoin, beginPayNo } = globaleConfig?.data?.data || {}
                 let enumList: any = state?.enumList
                 let PAYMENT_TYPE_Map: Map<any, any> = new Map(enumList?.PAYMENT_TYPE?.values?.map(({ value, description }: any) => [value, description]))
@@ -190,7 +190,13 @@ const Page: React.FC = (props: Props) => {
                     props?.onChange?.({ ...record?.longBookInfo, ...record })
                     props?.closeDrawer?.(false)
                 },
-            } : false}
+            } : {
+                alwaysShowAlert: true,//总是展示 alert，默认无选择不展示
+                hideSelectAll: true,// 隐藏全选框
+                renderCell: () => null,  // 隐藏选择列中的勾选框
+                columnTitle: '',  // 去掉选择列的表头
+                columnWidth: 0,  // 设置选择列宽度为 0
+            }}
             // 点击行
             onRow={(record) => ({
                 onClick: () => {
@@ -216,6 +222,7 @@ const Page: React.FC = (props: Props) => {
                 }, {});
                 return newParams
             }}
+            tableAlertOptionRender={false}
             request={async (params) => {
                 return await getList.run({ ...params, ...publicData }).then(res => {
                     setBookId(null)

src/pages/MiniApp/BookManage/Short/index.tsx

@@ -164,7 +164,6 @@ const Page: React.FC = (props: Props) => {
         loading={globaleConfig?.loading}
     >
         <ProTable<any, any>
-            // params={publicData}//改变立即触发刷新请求
             actionRef={actionRef}
             headerTitle={"小说列表"}
             rowKey={(r) => r.bookId}
@@ -177,7 +176,13 @@ const Page: React.FC = (props: Props) => {
                     props?.onChange?.({ ...record, ...record?.shortBookInfoVO })
                     props?.closeDrawer?.(false)
                 },
-            } : false}
+            } : {
+                alwaysShowAlert: true,//总是展示 alert，默认无选择不展示
+                hideSelectAll: true,// 隐藏全选框
+                renderCell: () => null,  // 隐藏选择列中的勾选框
+                columnTitle: '',  // 去掉选择列的表头
+                columnWidth: 0,  // 设置选择列宽度为 0
+            }}
             // 点击行
             onRow={(record) => ({
                 onClick: () => {
@@ -185,7 +190,7 @@ const Page: React.FC = (props: Props) => {
                     props?.closeDrawer?.(false)
                 }
             })}
-            tableAlertRender={() => {
+            tableAlertRender={!!props?.onChange ? false : () => {
                 let { paymentType, paymentOption, paymentCategory, paymentAmount, paymentCoin, beginPayNo } = globaleConfig?.data?.data || {}
                 let enumList: any = state?.enumList
                 let PAYMENT_TYPE_Map: Map<any, any> = new Map(enumList?.PAYMENT_TYPE?.values?.map(({ value, description }: any) => [value, description]))

src/pages/MiniApp/CompConfig/DrawerBox/index.less

@@ -2,7 +2,6 @@
 .pageList {
     display: flex;
     flex-flow: column;
-
     .box {
         width: 5vw;
         height: 4vw;
@@ -38,7 +37,7 @@
         /* 根据比例缩放高度 */
         // border: 1px solid #000;
         .tabs {
-            margin-bottom: 20px;
+            margin-bottom: calc(100vw / 150);
 
             .tabs_text {
                 width: 48px;
@@ -99,8 +98,10 @@
 
     .phone_footer {
         width: 17vw;
+        height:calc(100vw / 70) ;
         display: flex;
         justify-content: space-around;
+        align-items: center;
         div {
             font-size: calc(100vw / 150);
             font-weight: 500;

src/pages/MiniApp/EntWeChat/Welcome/content.less

@@ -1,5 +1,5 @@
 .content {
-    width: 40%;
+    width: 60%;
     margin: 0 auto;
     display: flex;
     flex-flow: column;

src/pages/MiniApp/Extend/Book/index.tsx

@@ -72,7 +72,7 @@ const Page: React.FC<Props> = (props) => {
             tableAlertRender={false}
             search={{
                 labelWidth: 90,
-                span: 4,
+                span: 6,
             }}
             formRef={form}
             request={async (params) => {

src/pages/MiniApp/Extend/Page/index.tsx

@@ -66,7 +66,7 @@ const Page: React.FC<Props> = (props) => {
             formRef={form}
             search={{
                 labelWidth: 90,
-                span: 4
+                span: 6
             }}
             request={async (params) => {
                 return await getList.run(params)

src/pages/MiniApp/MiniAppUser/WeChat/index.tsx

@@ -43,7 +43,7 @@ const Page: React.FC = () => {
             headerTitle={"微信小程序用户列表"}
             rowKey={(r) => r.id}
             search={{
-                labelWidth: 120,
+                labelWidth: 70,
             }}
             request={async (params) => {
                 return await getList.run(params)

src/pages/MiniApp/ModuleConfig/coin/index.tsx

@@ -165,7 +165,7 @@ const ConiPage: React.FC = () => {
         <Row gutter={[20, 20]}>
             {
                 getList?.data?.data?.map((item: { id: Key | null | undefined; templateName: string | number | boolean | ReactElement<any, string | JSXElementConstructor<any>> | Iterable<ReactNode> | ReactPortal | null | undefined; rechargeConfigs: any[]; templateType: number; templateDescription: string | number | boolean | ReactElement<any, string | JSXElementConstructor<any>> | Iterable<ReactNode> | ReactPortal | null | undefined }) => {
-                    return <Col key={item.id} style={{ cursor: 'pointer' }} onClick={() => { switchTemplate(item.id) }} xs={{ span: 24 }} sm={{ span: 8 }}>
+                    return <Col key={item.id} style={{ cursor: 'pointer' }} onClick={() => { switchTemplate(item.id) }} xs={{ span: 24 }} xl={{ span: 8}} >
                         <Card className={activeT === item.id ? styles.active : ""} style={{ background: activeT === item.id ? token.colorPrimaryBgHover : token.colorFillAlter }} hoverable>
                             <h3 style={{ fontSize: 16, fontWeight: 500, color: token.colorText, fontFamily: 'PingFang SC' }}>{item.templateName}</h3>
                             {

src/pages/MiniApp/ModuleConfig/vip/index.tsx

@@ -165,7 +165,7 @@ const VipPage: React.FC = () => {
         <Row gutter={[20, 20]}>
             {
                 getList?.data?.data?.map((item: { id: Key | null | undefined; templateName: string | number | boolean | ReactElement<any, string | JSXElementConstructor<any>> | Iterable<ReactNode> | ReactPortal | null | undefined; rechargeConfigs: any[]; templateType: number; templateDescription: string | number | boolean | ReactElement<any, string | JSXElementConstructor<any>> | Iterable<ReactNode> | ReactPortal | null | undefined }) => {
-                    return <Col key={item.id} style={{ cursor: 'pointer' }} onClick={() => { switchTemplate(item.id) }} xs={{span:24}} sm={{span:8}}>
+                    return <Col key={item.id} style={{ cursor: 'pointer' }} onClick={() => { switchTemplate(item.id) }} xs={{span:24}} xl={{span:8}}>
                         <Card className={activeT === item.id ? styles.active : ""} style={{ background: activeT === item.id ? token.colorPrimaryBgHover : token.colorFillAlter }} hoverable>
                             <h3 style={{ fontSize: 16, fontWeight: 500, color: token.colorText, fontFamily: 'PingFang SC' }}>{item.templateName}</h3>
                             {