1720

src/components/AutoTable/mtable.jsx

@@ -39,7 +39,7 @@ const Mtable = (props) => {
     activeTabKey, //激活的tabKey 拖拽表格唯一标识使用 其他情况用不到
     refreshDep, //依赖刷新 （已废弃）
     getDefaultSelected, //存在默认选中向上返回选中值
-    resizeable = true,
+    resizeable = false,
     dataSource,
   } = props;
 
@@ -101,6 +101,7 @@ const Mtable = (props) => {
           if (Array.isArray(it.options)) {
             options = {
               fieldProps: {
+                ...it?.fieldProps,
                 options: [...it.options],
               },
             };
@@ -162,6 +163,7 @@ const Mtable = (props) => {
         if (Array.isArray(it.options)) {
           options = {
             fieldProps: {
+              ...it?.fieldProps,
               options: [...it.options],
             },
           };

src/global.less

@@ -120,7 +120,7 @@ ol {
     font-size: 16px !important;
 
     .ant-tabs-tab-btn {
-      color: @primary-color !important;
+      color: @primary-color  !important;
     }
   }
 
@@ -497,7 +497,7 @@ ol {
   top: -162px;
   left: 74px;
   color: #1890ff;
-  
+
 }
 
 .ant-popover-buttons {
@@ -508,4 +508,8 @@ ol {
 
 .ant-input-number {
   width: 100%;
+}
+
+.ant-form-item-label {
+  pointer-events: none;
 }
\ No newline at end of file

src/pages/check/plan/index.jsx

 import * as React from 'react';
-    import { useState, useMemo, useRef } from 'react';
-    import DrawerPro from '@/components/DrawerPro';
-    import AutoTable from '@/components/AutoTable';
-    import PremButton from '@/components/PremButton';
-    import getcolumns from './columns';
-    import { useRequest } from 'ahooks';
-    import { doFetch } from '@/utils/doFetch';
+import { useState, useMemo, useRef } from 'react';
+import DrawerPro from '@/components/DrawerPro';
+import AutoTable from '@/components/AutoTable';
+import PremButton from '@/components/PremButton';
+import getcolumns from './columns';
+import { useRequest } from 'ahooks';
+import { doFetch } from '@/utils/doFetch';
 
-    function Plan(props) {
-      const actionRef = useRef(),
-        formRef = useRef();
-      const [drawer, setdrawer] = useState({
+function Plan(props) {
+  const actionRef = useRef(),
+    formRef = useRef();
+  const [drawer, setdrawer] = useState({
+    open: false,
+  }),
+    [activeTabKey, setactiveTabKey] = useState(1);
+
+  const { run, loading } = useRequest(doFetch, {
+    manual: true,
+    onSuccess: (res, params) => {
+      if (res?.code == '0000') {
+        actionRef?.current?.reload();
+        setdrawer((s) => ({
+          ...s,
           open: false,
-        }),
-        [activeTabKey, setactiveTabKey] = useState(1);
+        }));
+      }
+    },
+  });
 
-      const { run, loading } = useRequest(doFetch, {
-        manual: true,
-        onSuccess: (res, params) => {
-          if (res?.code == '0000') {
-            actionRef?.current?.reload();
+  const detail = (text, row, _, action) => {
+    return (
+      <PremButton
+        btn={{
+          size: 'small',
+          type: 'link',
+          onClick: () => {
             setdrawer((s) => ({
               ...s,
-              open: false,
+              open: true,
+              item: row,
+              title: '详情',
+              val: 'detail',
+              title: '详细信息',
             }));
-          }
-        },
-      });
-
-      const detail = (text, row, _, action) => {
-        return (
-          <PremButton
-            btn={{
-              size: 'small',
-              type: 'link',
-              onClick: () => {
-                setdrawer((s) => ({
-                  ...s,
-                  open: true,
-                  item: row,
-                  title: '详情',
-                  val: 'detail',
-                  title: '详细信息',
-                }));
-              },
-            }}
-          >
-            详情
-          </PremButton>
-        );
-      };
+          },
+        }}
+      >
+        详情
+      </PremButton>
+    );
+  };
 
-      const edit = (text, row, _, action) => {
-        return (
-          <PremButton
-            btn={{
-              size: 'small',
-              onClick: () => {
-                setdrawer((s) => ({
-                  ...s,
-                  open: true,
-                  item: row,
-                  title: '编辑',
-                  val: 'edit',
-                }));
-              },
-            }}
-          >
-            编辑
-          </PremButton>
-        );
-      };
-
-      const remove = (text, row, _, action) => {
-        return (
-          <PremButton
-            pop={{
-              title: '是否删除?',
-              okText: '确认',
-              cancelText: '取消',
-              onConfirm: () => {
-                run({ url: pathconfig?.delete || '/delete', params: { id: row?.id } });
-              },
-            }}
-            btn={{
-              size: 'small',
-              type: 'danger',
-            }}
-          >
-            删除
-          </PremButton>
-        );
-      };
+  const edit = (text, row, _, action) => {
+    return (
+      <PremButton
+        btn={{
+          size: 'small',
+          onClick: () => {
+            setdrawer((s) => ({
+              ...s,
+              open: true,
+              item: row,
+              title: '编辑',
+              val: 'edit',
+            }));
+          },
+        }}
+      >
+        编辑
+      </PremButton>
+    );
+  };
 
-      const columns = useMemo(() => {
-        let defcolumn = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.columns;
-        let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
-        return defcolumn.concat({
-          title: '操作',
-          valueType: 'option',
-          width: 150,
-          render: (text, row, _, action) => [
-            defpath?.enabledetail && detail(text, row, _, action),
-            defpath?.enableedit && edit(text, row, _, action),
-            defpath?.enabledelete && remove(text, row, _, action),
-          ],
-        });
-      }, [activeTabKey]);
+  const remove = (text, row, _, action) => {
+    return (
+      <PremButton
+        pop={{
+          title: '是否删除?',
+          okText: '确认',
+          cancelText: '取消',
+          onConfirm: () => {
+            run({ url: pathconfig?.delete || '/delete', params: { id: row?.id } });
+          },
+        }}
+        btn={{
+          size: 'small',
+          type: 'danger',
+        }}
+      >
+        删除
+      </PremButton>
+    );
+  };
 
-      const pathconfig = useMemo(() => {
-        let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
-        return defpath;
-      }, [activeTabKey]);
+  const columns = useMemo(() => {
+    let defcolumn = getcolumns(setdrawer, run).filter((it) => it.key == activeTabKey)[0]?.columns;
+    let defpath = getcolumns(setdrawer, run).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
+    return activeTabKey == 1 ? defcolumn.concat({
+      title: '操作',
+      valueType: 'option',
+      width: 150,
+      render: (text, row, _, action) => [
+        defpath?.enableedit && edit(text, row, _, action),
+        defpath?.enabledelete && remove(text, row, _, action),
+      ],
+    }) : defcolumn;
+  }, [activeTabKey]);
 
-      return (
-        <div style={{ position: 'relative' }}>
-          <AutoTable
-            pagetitle="点检计划"
-            columns={columns}
-            path={pathconfig?.list || '/ngic-auth/sysUser/query/page'}
-            actionRef={actionRef}
-            pageextra={pathconfig?.enableadd ? 'add' : null}
-            resizeable={true}
-            addconfig={{
-              // access: 'sysDepartment_save',
-              btn: {
-                disabled: false,
-                onClick: () => {
-                  setdrawer((s) => ({
-                    ...s,
-                    open: true,
-                    item: null,
-                    title: '新增',
-                    val: 'add',
-                  }));
-                },
-              },
-            }}
-            tabList={getcolumns()}
-            activeTabKey={activeTabKey}
-            onTabChange={(key) => {
-              setactiveTabKey(key);
-            }}
-          />
+  const pathconfig = useMemo(() => {
+    let defpath = getcolumns(setdrawer).filter((it) => it.key == activeTabKey)[0]?.pathconfig ?? {};
+    return defpath;
+  }, [activeTabKey]);
 
-          <DrawerPro
-            fields={columns}
-            detailpath={pathconfig?.detail || null}
-            detailData={drawer?.item}
-            defaultFormValue={drawer?.item}
-            params={{ id: drawer?.item?.id }}
-            formRef={formRef}
-            placement="right"
-            onClose={() => {
+  return (
+    <div style={{ position: 'relative' }}>
+      <AutoTable
+        pagetitle="点检计划"
+        columns={columns}
+        path={pathconfig?.list || '/ngic-auth/sysUser/query/page'}
+        actionRef={actionRef}
+        pageextra={pathconfig?.enableadd ? 'add' : null}
+        addconfig={{
+          // access: 'sysDepartment_save',
+          btn: {
+            disabled: false,
+            onClick: () => {
               setdrawer((s) => ({
                 ...s,
-                open: false,
+                open: true,
+                item: null,
+                title: '新增',
+                val: 'add',
               }));
-            }}
-            {...drawer}
-            onFinish={(vals) => {
-              if (drawer?.val == 'add') {
-                run({ url: pathconfig?.add || '/add', params: { ...vals } });
-              } else if (drawer?.val == 'edit') {
-                run({ url: pathconfig?.edit || '/edit', params: { ...vals, id: drawer?.item?.id } });
-              }
-            }}
-          />
-        </div>
-      );
-    }
+            },
+          },
+        }}
+        tabList={getcolumns()}
+        activeTabKey={activeTabKey}
+        onTabChange={(key) => {
+          setactiveTabKey(key);
+        }}
+      />
+
+      <DrawerPro
+        fields={columns}
+        detailpath={pathconfig?.detail || null}
+        detailData={drawer?.item}
+        defaultFormValue={drawer?.item}
+        params={{ id: drawer?.item?.id }}
+        formRef={formRef}
+        placement="right"
+        onClose={() => {
+          setdrawer((s) => ({
+            ...s,
+            open: false,
+          }));
+        }}
+        {...drawer}
+        onFinish={(vals) => {
+          if (drawer?.val == 'add') {
+            run({ url: pathconfig?.add || '/add', params: { ...vals } });
+          } else if (drawer?.val == 'edit') {
+            run({ url: pathconfig?.edit || '/edit', params: { ...vals, id: drawer?.item?.id } });
+          }
+        }}
+      />
+    </div>
+  );
+}
 
-    export default Plan;
-    
+export default Plan;
\ No newline at end of file