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

@@ -509,3 +509,7 @@ 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) {
+function Plan(props) {
   const actionRef = useRef(),
     formRef = useRef();
   const [drawer, setdrawer] = useState({
@@ -94,18 +94,17 @@ import * as React from 'react';
   };
 
   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({
+    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?.enabledetail && detail(text, row, _, action),
         defpath?.enableedit && edit(text, row, _, action),
         defpath?.enabledelete && remove(text, row, _, action),
       ],
-        });
+    }) : defcolumn;
   }, [activeTabKey]);
 
   const pathconfig = useMemo(() => {
@@ -121,7 +120,6 @@ import * as React from 'react';
         path={pathconfig?.list || '/ngic-auth/sysUser/query/page'}
         actionRef={actionRef}
         pageextra={pathconfig?.enableadd ? 'add' : null}
-            resizeable={true}
         addconfig={{
           // access: 'sysDepartment_save',
           btn: {
@@ -169,7 +167,6 @@ import * as React from 'react';
       />
     </div>
   );
-    }
-
-    export default Plan;
+}
 
+export default Plan;