Kaynağa Gözat

修复部分bug

code4eat 2 yıl önce
ebeveyn
işleme
4f58443937

+ 17 - 20
src/pages/setting/reportSet/diySqlMana/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-04-11 19:51:04
+ * @LastEditTime: 2023-04-13 18:42:55
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -219,28 +219,25 @@ export default function DiySqlMana() {
             <div className='toolBar'>
                 <div className='filter'>
                     <div className='filterItem'>
-                        <span className='label' style={{ whiteSpace: 'nowrap' }}> 检索:</span>
-                        <Input placeholder={'请输入SQL类型'} allowClear
-                            suffix={
-                                <IconFont type="iconsousuo" onClick={() => tableDataSearchHandle('sqlType')} />
-                            }
-                            onChange={(e) => {
-                                set_tableDataSearchKeywords(e.target.value);
-                                if (e.target.value.length == 0) {
-                                    set_tableDataFilterParams({
-                                        ...tableDataFilterParams,
-                                        sqlType: ''
-                                    });
+                        <span className='label'>检索:</span>
+                        <ProFormSelect
+                            noStyle
+                            allowClear
+                            placeholder="请选择类型"
+                            style={{ width: 160, marginRight: 16 }}
+                            request={async () => {
+                                const resp = await getSqlTypeList();
+
+                                if (resp) {
+                                    return resp.list.map((a: any) => ({ label: a.name, value: a.code }))
                                 }
-                            }}
-                            onPressEnter={(e) => {
 
-                                set_tableDataFilterParams({
-                                    ...tableDataFilterParams,
-                                    sqlType: (e.target as HTMLInputElement).value
-                                });
                             }}
-
+                            fieldProps={{
+                                onChange(value, option) {
+                                    set_tableDataFilterParams({ ...tableDataFilterParams, sqlType: value })
+                                },
+                            }}
                         />
                     </div>
                 </div>

+ 4 - 1
src/pages/setting/reportSet/reportListMana/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-04-07 10:12:37
+ * @LastEditTime: 2023-04-13 18:48:18
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -222,6 +222,9 @@ export default function ReportListMana() {
                     return updateTable(type == 'EDIT' ? { ...record, ...val, sql: val.sql ? val.sql : '', } : { ...val }, type);
                 }}
                 colProps={{ span: 24 }}
+                modalProps={{
+                    destroyOnClose:true
+                }}
                 grid
             >
 

+ 2 - 2
src/pages/setting/reportSet/reportNavSet/index.tsx

@@ -2,7 +2,7 @@
  * @Author: code4eat awesomedema@gmail.com
  * @Date: 2023-03-03 11:30:33
  * @LastEditors: code4eat awesomedema@gmail.com
- * @LastEditTime: 2023-04-13 18:16:53
+ * @LastEditTime: 2023-04-13 18:49:46
  * @FilePath: /KC-MiddlePlatform/src/pages/platform/setting/pubDicTypeMana/index.tsx
  * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
  */
@@ -42,7 +42,7 @@ export default function ReportNavSet() {
 
         {
             title: '源报表名称',
-            dataIndex: 'redirectReportName',
+            dataIndex: 'reportName',
         },
         {
             title: '报表列名称',