Merge branch 'master' of http://47.100.234.193:9527/wuhao/ems3.3

src/components/AutoTable/mtable.jsx

@@ -43,7 +43,6 @@ const Mtable = (props) => {
     dataSource,
   } = props;
 
-  console.log('this is path:', path);
   const actionRefs = actionRef ?? useRef(),
     formRefs = formRef ?? useRef(),
     ifspagination = pagination == 'false' || pagination === false,
@@ -92,10 +91,10 @@ const Mtable = (props) => {
         let itemwidth = valueColumns[it.key]?.width
           ? valueColumns[it.key].width
           : it.width
-            ? it.width
-            : resizeable
-              ? 160
-              : 'auto';
+          ? it.width
+          : resizeable
+          ? 160
+          : 'auto';
         let options = {};
         if (['select', 'treeSelect', 'radio', 'checkbox', 'cascader'].includes(it?.valueType)) {
           if (Array.isArray(it.options)) {
@@ -281,79 +280,79 @@ const Mtable = (props) => {
   //缩放表格
   const handleResize =
     (index) =>
-      (e, { size }) => {
-        e.stopImmediatePropagation();
-        setcolumnes((s) => {
-          const nextColumns = [...s];
-          nextColumns[index] = {
-            ...nextColumns[index],
-            width: size.width,
-          };
-          return nextColumns;
-        });
-      };
+    (e, { size }) => {
+      e.stopImmediatePropagation();
+      setcolumnes((s) => {
+        const nextColumns = [...s];
+        nextColumns[index] = {
+          ...nextColumns[index],
+          width: size.width,
+        };
+        return nextColumns;
+      });
+    };
 
   //更新表格缩放
   const handleResizeStop =
     (index) =>
-      (e, { size }) => {
-        e.stopImmediatePropagation();
-        let submitdata = { ...valueColumns } ?? {},
-          curkey = Object.keys(submitdata)[index];
-        submitdata[curkey].width = parseInt(size.width);
-        setvalueColumns(submitdata);
-        doFetch({
-          url: '/ngic-base-business/paFieldScene/save',
-          params: {
-            sceneMark: activeTabKey ? path + activeTabKey : path,
-            controList: Object.keys(submitdata).map((it, i) => {
-              return {
-                fieldKey: it,
-                fieldWidth: i == index ? parseInt(size.width) : submitdata[it].width,
-                fieldOrder: submitdata[it].order,
-                fieldFixed: submitdata[it].fixed,
-                fieldShow: submitdata[it].show,
-              };
-            }),
-          },
-        });
-      };
+    (e, { size }) => {
+      e.stopImmediatePropagation();
+      let submitdata = { ...valueColumns } ?? {},
+        curkey = Object.keys(submitdata)[index];
+      submitdata[curkey].width = parseInt(size.width);
+      setvalueColumns(submitdata);
+      doFetch({
+        url: '/ngic-base-business/paFieldScene/save',
+        params: {
+          sceneMark: activeTabKey ? path + activeTabKey : path,
+          controList: Object.keys(submitdata).map((it, i) => {
+            return {
+              fieldKey: it,
+              fieldWidth: i == index ? parseInt(size.width) : submitdata[it].width,
+              fieldOrder: submitdata[it].order,
+              fieldFixed: submitdata[it].fixed,
+              fieldShow: submitdata[it].show,
+            };
+          }),
+        },
+      });
+    };
 
   const components = resizeable
     ? {
-      components: {
-        header: {
-          cell: Resizecell,
+        components: {
+          header: {
+            cell: Resizecell,
+          },
         },
-      },
-      columnsState: {
-        value: valueColumns,
-        onChange: (val, state) => {
-          setvalueColumns((s) => {
-            let submitdata = {
-              ...s,
-              ...val,
-            };
-            doFetch({
-              url: '/ngic-base-business/paFieldScene/save',
-              params: {
-                sceneMark: activeTabKey ? path + activeTabKey : path,
-                controList: Object.keys(submitdata).map((it) => {
-                  return {
-                    fieldKey: it,
-                    fieldWidth: submitdata[it].width,
-                    fieldOrder: submitdata[it].order,
-                    fieldFixed: submitdata[it].fixed,
-                    fieldShow: submitdata[it].show,
-                  };
-                }),
-              },
+        columnsState: {
+          value: valueColumns,
+          onChange: (val, state) => {
+            setvalueColumns((s) => {
+              let submitdata = {
+                ...s,
+                ...val,
+              };
+              doFetch({
+                url: '/ngic-base-business/paFieldScene/save',
+                params: {
+                  sceneMark: activeTabKey ? path + activeTabKey : path,
+                  controList: Object.keys(submitdata).map((it) => {
+                    return {
+                      fieldKey: it,
+                      fieldWidth: submitdata[it].width,
+                      fieldOrder: submitdata[it].order,
+                      fieldFixed: submitdata[it].fixed,
+                      fieldShow: submitdata[it].show,
+                    };
+                  }),
+                },
+              });
+              return submitdata;
             });
-            return submitdata;
-          });
+          },
         },
-      },
-    }
+      }
     : {};
 
   const datas = dataSource ? { dataSource, toolBarRender: false } : { request };
@@ -402,19 +401,19 @@ const Mtable = (props) => {
       scroll={
         x
           ? {
-            x: x,
-          }
+              x: x,
+            }
           : {}
       }
       pagination={
         pagination
           ? {
-            showTotal: (total, range) => <span>共{total}条</span>,
-            showQuickJumper: true,
-            showSizeChanger: true,
-            pageSizeOptions: [5, 10, 15, 30, 50, 100, 200],
-            defaultPageSize: pageSize || 15,
-          }
+              showTotal: (total, range) => <span>共{total}条</span>,
+              showQuickJumper: true,
+              showSizeChanger: true,
+              pageSizeOptions: [5, 10, 15, 30, 50, 100, 200],
+              defaultPageSize: pageSize || 15,
+            }
           : false
       }
       search={{

src/components/InitForm/Diyrule/index.jsx

@@ -517,7 +517,7 @@ let Diyrule = (props) => {
               options={Object.keys(Array.apply(null, { length: value ? value.length : 0 })).map(
                 (it, i) => ({
                   label: `第${i + 1}个`,
-                  value: i + 2,
+                  value: i + 1,
                 }),
               )}
               onChange={(val) => {