FormList组件修改

FormInsertDiy/ExportComponent/ActiveMenuComponent.js

@@ -116,7 +116,6 @@ function ActiveMenuComponent({ routerConfig, ...otherProps }) {
 		default:
 			break;
 	}
-	console.log('112233');
 	return (
 		<CreateC.Provider
 			value={{

one_stop_public/libs/TableList.js

@@ -68,9 +68,9 @@ export default class TableList extends React.Component {
 	}
 
 	render() {
-		const { isTree, json, uuid } = this.props;
+		const { isTree, json, uuid, obj } = this.props;
 		const { showNo } = this.state;
-		// console.log(showNo);
+		// console.log(obj);
 		if (showNo) {
 			return null;
 		}
@@ -91,7 +91,8 @@ export default class TableList extends React.Component {
 				objCode={this.props.objCode}
 				isFormCom={true}
 				uuid={uuid}
-				sql={this.props.sql}
+        obj={obj}
+        sql={this.props.sql}
 			/>
 		) : (
 			<FormList
@@ -108,6 +109,7 @@ export default class TableList extends React.Component {
 				notShowBack={true}
 				rights={this.props.rights || []}
 				objCode={this.props.objCode}
+        obj={obj}
 				isFormCom={true}
 				uuid={uuid}
 				sql={this.props.sql}

one_stop_public/libs/formList/SplitButton.js

+import React, { useEffect, useState } from 'react';
+import { Button } from 'antd';
+
+export default function SplitButton(props) {
+  const [stateProps, setProps] = useState({ ...props });
+
+  // useEffect(() => {
+  //   setProps({
+  //     ...stateProps,
+  //     onClick: props.onClick && typeof props.onClick === 'function' && props.onClick.bind(this, props.selectedRows, props.obj),
+  //   });
+  // }, [props.selectedRows, props.obj]);
+
+  useEffect(() => {
+    if(props.changeButtonProps && typeof props.changeButtonProps === 'function'){
+      props.changeButtonProps({
+        selectedRows: props.selectedRows,
+        setProps,
+        stateProps,
+      });
+    }
+
+  }, [props.selectedRows]);
+
+  const handleClick = (e) => {
+    if(props.onClick && typeof props.onClick === 'function'){
+      props.onClick(e, props.selectedRows, props.obj);
+    }
+  };
+
+
+  return <Button {...stateProps} onClick={handleClick}/>;
+}

one_stop_public/libs/formList/SplitIndex.js

@@ -3,90 +3,99 @@ import { Button } from 'antd';
 import ImportUtil from '@/webPublic/one_stop_public/App/ImportUtil';
 import ExportCurrentInfo from '@/webPublic/one_stop_public/App/ExportCurrentInfo';
 import { Base16Encode } from '@/webPublic/one_stop_public/Base16';
+import SplitButton from '@/webPublic/one_stop_public/libs/formList/SplitButton';
 
 export function FormListButtons(props) {
-  const [ConcatButtons, setConCatButtons] = useState([]);
-  const {
-    btns,
-    loading,
-    importConfig,
-    getPage,
-    objId,
-    query,
-    custom,
-    sql,
-    exportConfig
-  } = props;
-  const Before = btns && btns.before || [];
-  useEffect(() => {
-    let buttons = [];
-    buttons = Before.map((g) => {
-      g.ButtonType = 'Normal';
-      return g;
-    });
-    for (let item of importConfig) {
-      buttons.push({
-        ...item,
-        ButtonType: 'import',
-      });
-    }
-    let i = 0;
-    for (let item of exportConfig) {
-      buttons.push({
-        ...item,
-        ButtonType: 'export',
-        index: i++,
-      });
-    }
-    buttons.sort((a, b) => {
-      let priorityA = a.priority || 0;
-      let priorityB = b.priority || 0;
-      return priorityA - priorityB;
-    });
-    setConCatButtons(buttons);
-  }, [exportConfig, importConfig, btns]);
-  if (!ConcatButtons || !ConcatButtons.length) {
-    return null;
-  }
+	const [ConcatButtons, setConCatButtons] = useState([]);
+	const {
+		btns,
+		loading,
+		importConfig,
+		getPage,
+		objId,
+		query,
+		custom,
+		sql,
+		exportConfig,
+		selectedRows,
+    obj,
+	} = props;
+	const Before = (btns && btns.before) || [];
+	useEffect(
+		() => {
+			let buttons = [];
+			buttons = Before.map((g) => {
+				g.ButtonType = 'Normal';
+				return g;
+			});
+			for (let item of importConfig) {
+				buttons.push({
+					...item,
+					ButtonType: 'import',
+				});
+			}
+			let i = 0;
+			for (let item of exportConfig) {
+				buttons.push({
+					...item,
+					ButtonType: 'export',
+					index: i++,
+				});
+			}
+			buttons.sort((a, b) => {
+				let priorityA = a.priority || 0;
+				let priorityB = b.priority || 0;
+				return priorityA - priorityB;
+			});
+			setConCatButtons(buttons);
+		},
+		[exportConfig, importConfig, btns],
+	);
 
-  return ConcatButtons.map((r, i) => {
-    if (r.ButtonType === 'Normal') {
-      const propsR = { ...r };
-      delete propsR.ButtonType;
-      return <Button {...propsR}
-                     loading={loading}
-                     key={r.children}
-      />;
-    } else if (r.ButtonType === 'import') {
-      return (<ImportUtil
-        btn={r.btn}
-        key={r.btn?.name || '导入'}
-        ext={r.ext ? r.ext : 'xlsx'}
-        importConfig={r}
-        objId={objId}
-        callback={() => {
-          getPage();
-          if (r.callback && typeof r.callback === 'function') {
-            r.callback();
-          }
-        }}
-      />);
-    } else if (r.ButtonType === 'export') {
-      return <ExportCurrentInfo
-        {...r}
-        objId={objId}
-        key={r.children || '到处'}
-        query={query}
-        custom={custom}
-        index={r.index}
-        btn={r.btn}
-        ext={r.ext ? r.ext : 'xlsx'}
-        openSelectFieldsModal={r.openSelectFieldsModal || false}
-        sql={Base16Encode(sql)}
-      />;
-    }
-  });
+	if (!ConcatButtons || !ConcatButtons.length) {
+		return null;
+	}
 
+	return ConcatButtons.map((r, i) => {
+		if (r.ButtonType === 'Normal') {
+			const propsR = { ...r };
+			delete propsR.ButtonType;
+			return (
+				<SplitButton {...propsR} loading={loading} key={r.children} selectedRows={selectedRows} obj={obj}/>
+			);
+		} else if (r.ButtonType === 'import') {
+			return (
+				<ImportUtil
+					btn={r.btn}
+					key={r.btn?.name || '导入'}
+					ext={r.ext ? r.ext : 'xlsx'}
+					importConfig={r}
+					objId={objId}
+					callback={() => {
+						getPage();
+						if (r.callback && typeof r.callback === 'function') {
+							r.callback();
+						}
+					}}
+				/>
+			);
+		} else if (r.ButtonType === 'export') {
+			return (
+				<ExportCurrentInfo
+					{...r}
+					objId={objId}
+					key={r.children || '到处'}
+					query={query}
+					custom={custom}
+					index={r.index}
+					btn={r.btn}
+					ext={r.ext ? r.ext : 'xlsx'}
+					openSelectFieldsModal={r.openSelectFieldsModal || false}
+					sql={Base16Encode(sql)}
+				/>
+			);
+		}
+	});
 
-  // return Before.map((r) => <Button {...r} loading={loading} key={r.children} />);
+	// return Before.map((r) => <Button {...r} loading={loading} key={r.children} />);
 }

one_stop_public/libs/formList/index.js

@@ -1181,6 +1181,7 @@ class FormList extends React.Component {
 			istableCom, // 是否有模板设计器调用
 			value: { btns },
 			uuid,
+      obj,
 		} = this.props;
 		const { showMobileDiv, isView, loading } = this.state;
 
@@ -1351,6 +1352,8 @@ class FormList extends React.Component {
 								query={JSON.stringify(this.state.formValues)}
 								custom={this.props.value ? Base16Encode(JSON.stringify(this.props.value)) : null}
 								sql={Base16Encode(this.props.sql)}
+                selectedRows={selectedRows}
+                obj={obj}
 							/>
 							{rights && !rights.includes('add') ? (
 								''

one_stop_public/tableCompon/index.jsx

@@ -1045,6 +1045,27 @@ export default class TableCom extends Component {
     return 'norefeshxxxxxxxxxxxxxxxxxxxx';
   };
 
+
+  getObjValues = () => {
+    const { isEdit, fatherObj, defaultValues, formKey, form, fatherCode } = this.props;
+    let obj = {};
+    if (!isEdit && fatherCode) {
+      obj = {
+        ...fatherObj,
+        ...form.getFieldsValue(),
+        ...defaultValues[formKey],
+      };
+    } else {
+      obj = {
+        ...(fatherObj ? fatherObj : {}),
+        ...this.props.obj,
+        ...form.getFieldsValue(),
+        ...defaultValues[formKey],
+      };
+    }
+    return obj;
+  }
+
   functionArguments = (column, callback) => {
     const base52 = column.base52;
     const {
@@ -1078,21 +1099,7 @@ export default class TableCom extends Component {
       };
     }
 
-    let obj = {};
-    if (!isEdit && fatherCode) {
-      obj = {
-        ...fatherObj,
-        ...form.getFieldsValue(),
-        ...defaultValues[formKey],
-      };
-    } else {
-      obj = {
-        ...(fatherObj ? fatherObj : {}),
-        ...this.props.obj,
-        ...form.getFieldsValue(),
-        ...defaultValues[this.props.formKey],
-      };
-    }
+    let obj = this.getObjValues();
 
     /**
      * 中台函数库注入
@@ -2692,6 +2699,7 @@ ${obj[dataColumn.base52]}
               objCode={json.objCode}
               sql={json.filterSql}
               rights={json.rights}
+              obj={this.getObjValues()}
             />
           );
           break;
@@ -3963,6 +3971,7 @@ ${obj[dataColumn.base52]}
                     sql={json.filterSql}
                     rights={json.rights}
                     get={get}
+                    obj={this.getObjValues()}
                   />,
                 )}
               </>