refactor: 同步代码

@@ -2138,6 +2138,12 @@ export function executeDefault(
           form.setValueByPath(fieldPath, realValue);
           form.setValueByPath(fieldPath, realValue);
           break;*/
           break;*/
         case 'OTHER':
         case 'OTHER':
+          if (default_init) {
+            // 编辑时第一次不执行
+            form.setSchemaByPath(fieldPath, { default_init: false });
+            return;
+          }
+
           //TODO 当前人员和部门在初始化schema时处理, 字段值在这里处理
           //TODO 当前人员和部门在初始化schema时处理, 字段值在这里处理
 
 
           //子表中的默认值
           //子表中的默认值

@@ -95,11 +95,7 @@ const CustomButton = (props: any) => {
         const errorCount = ids.length - res.length;
         const errorCount = ids.length - res.length;
         if (errorCount > 0) {
         if (errorCount > 0) {
           message.warn(
           message.warn(
-            '成功更新【' +
-              res.length +
-              '】条记录，【' +
-              errorCount +
-              '】条记录无权限更新',
+            '成功更新【' + res.length + '】条记录，【' + errorCount + '】条记录无权限更新',
           );
           );
         } else {
         } else {
           message.success('更新成功');
           message.success('更新成功');
@@ -127,11 +123,7 @@ const CustomButton = (props: any) => {
         Modal.confirm({
         Modal.confirm({
           content: lastedButtonData.confirmContent,
           content: lastedButtonData.confirmContent,
           onOk: () => {
           onOk: () => {
-            executeButtonAction(
-              lastedButtonData.code,
-              lastedButtonData.ids,
-              data,
-            );
+            executeButtonAction(lastedButtonData.code, lastedButtonData.ids, data);
           },
           },
           onCancel: () => {
           onCancel: () => {
             dialogRef.current.setLoading(false);
             dialogRef.current.setLoading(false);
@@ -156,15 +148,9 @@ const CustomButton = (props: any) => {
       appCode: currDataItemCtrl.appCode,
       appCode: currDataItemCtrl.appCode,
       funCode: currDataItemCtrl.funCode,
       funCode: currDataItemCtrl.funCode,
       viewCode: currDataItemCtrl.viewCode,
       viewCode: currDataItemCtrl.viewCode,
-      id:
-        typeof currDataItemCtrl.id === 'string'
-          ? [currDataItemCtrl.id]
-          : currDataItemCtrl.id,
+      id: typeof currDataItemCtrl.id === 'string' ? [currDataItemCtrl.id] : currDataItemCtrl.id,
     };
     };
-    if (
-      currDataItemCtrl.from &&
-      ['button-rel', 'button'].includes(currDataItemCtrl.from)
-    ) {
+    if (currDataItemCtrl.from && ['button-rel', 'button'].includes(currDataItemCtrl.from)) {
       data.actionCode = currDataItemCtrl?.params?.actionCode;
       data.actionCode = currDataItemCtrl?.params?.actionCode;
       if (['button-rel'].includes(currDataItemCtrl.from)) {
       if (['button-rel'].includes(currDataItemCtrl.from)) {
         data.appCode = currDataItemCtrl?.params?.appCode;
         data.appCode = currDataItemCtrl?.params?.appCode;
@@ -238,7 +224,10 @@ const CustomButton = (props: any) => {
     ) {
     ) {
       const floatSchema = getFormFieldsList(schemaItem);
       const floatSchema = getFormFieldsList(schemaItem);
       //const result = handleBtnFormSchema(floatSchema);
       //const result = handleBtnFormSchema(floatSchema);
-      hiddenAll = floatSchema.every((item: any) => item.hidden);
+      const finalSchema = floatSchema.filter((item: any) => {
+        return item?.title;
+      });
+      hiddenAll = finalSchema.every((item: any) => item.hidden);
     }
     }
     //判断是否需要全隐藏
     //判断是否需要全隐藏
     /*
     /*
@@ -249,7 +238,7 @@ const CustomButton = (props: any) => {
      * */
      * */
     if (
     if (
       (actType === 'EDIT_FORM' && !hiddenAll) ||
       (actType === 'EDIT_FORM' && !hiddenAll) ||
-      actType === 'EDIT_REL_FORM' ||
+      (actType === 'EDIT_REL_FORM' && !hiddenAll) ||
       (actType === 'REL_EDIT_REL_FORM' && !hiddenAll) ||
       (actType === 'REL_EDIT_REL_FORM' && !hiddenAll) ||
       (actType === 'REL_EDIT_FORM' && !hiddenAll)
       (actType === 'REL_EDIT_FORM' && !hiddenAll)
     ) {
     ) {
@@ -295,9 +284,7 @@ const CustomButton = (props: any) => {
             // appCode: appCode,
             // appCode: appCode,
             // funCode: funCode,
             // funCode: funCode,
             fieldName: schemaItem.fieldKey,
             fieldName: schemaItem.fieldKey,
-            pageType: ['EDIT_REL_FORM', 'REL_EDIT_REL_FORM'].includes(actType)
-              ? 'add'
-              : 'edit',
+            pageType: ['EDIT_REL_FORM', 'REL_EDIT_REL_FORM'].includes(actType) ? 'add' : 'edit',
           },
           },
           params: {
           params: {
             actionCode: btnData.code,
             actionCode: btnData.code,
@@ -320,9 +307,7 @@ const CustomButton = (props: any) => {
             appCode: appCode,
             appCode: appCode,
             funCode: schemaItem.masterFunCode,
             funCode: schemaItem.masterFunCode,
             fieldName: schemaItem.fieldKey,
             fieldName: schemaItem.fieldKey,
-            pageType: ['EDIT_REL_FORM', 'REL_EDIT_REL_FORM'].includes(actType)
-              ? 'add'
-              : 'edit',
+            pageType: ['EDIT_REL_FORM', 'REL_EDIT_REL_FORM'].includes(actType) ? 'add' : 'edit',
           },
           },
           params: {
           params: {
             actionCode: btnData.code,
             actionCode: btnData.code,
@@ -411,7 +396,7 @@ const CustomButton = (props: any) => {
         }}
         }}
       />
       />
 
 
-      <OpenLink cRef={linkRef} />
+      <OpenLink cRef={linkRef} title={btnData?.name} />
     </>
     </>
   );
   );
 };
 };

-import React, { useImperativeHandle, useRef, useState } from 'react';
-import { Button, Drawer, Space } from 'antd';
+import React, { useImperativeHandle, useRef, useState, useEffect } from 'react';
+import { Button, Drawer, Space, Modal } from 'antd';
 import { history, useLocation } from 'umi';
 import { history, useLocation } from 'umi';
 import { handleWindowOpen } from '@/utils';
 import { handleWindowOpen } from '@/utils';
+import Draggable from 'react-draggable';
 
 
 // TODO: 公共依赖
 // TODO: 公共依赖
 import { doBtnJump } from '@/pages/app-view/list/util';
 import { doBtnJump } from '@/pages/app-view/list/util';
@@ -24,8 +25,50 @@ const FORM_SCHEMA = {};
 	}
 	}
 } */
 } */
 
 
+/*表单页--弹框的形式*/
+interface UrlDialogProp {
+  visible: boolean;
+  title: string;
+  url: string;
+  onVisibleChange: (visible: boolean) => void;
+}
+
+export const UrlDialog: React.FC<UrlDialogProp> = (props) => {
+  const [visible, setVisible] = useState(false);
+
+  useEffect(() => {
+    setVisible(props?.visible);
+  }, [props?.visible]);
+
+  useEffect(() => {
+    props.onVisibleChange(visible);
+  }, [visible]);
+
+  return (
+    <>
+      <Modal
+        title={props.title}
+        width={'864px'}
+        visible={visible}
+        bodyStyle={{ padding: '20px 10px 20px 20px' }} // 不能加 对其详情有影响
+        onCancel={() => setVisible(false)}
+        footer={false}
+        destroyOnClose={true}
+        modalRender={(node) => (
+          <Draggable handle=".ant-modal-header">
+            <div>{node}</div>
+          </Draggable>
+        )}
+      >
+        <iframe src={props.url} style={{ width: '100%', height: '500px' }} frameBorder="0" />
+      </Modal>
+    </>
+  );
+};
+
 type ButtonFormProps = {
 type ButtonFormProps = {
   cRef: any;
   cRef: any;
+  title?: string;
   successCallback?: (result: any) => void;
   successCallback?: (result: any) => void;
 };
 };
 const ButtonForm: React.FC<ButtonFormProps> = (props) => {
 const ButtonForm: React.FC<ButtonFormProps> = (props) => {
@@ -35,6 +78,9 @@ const ButtonForm: React.FC<ButtonFormProps> = (props) => {
   const { pathname } = useLocation();
   const { pathname } = useLocation();
 
 
   const [query, setQuery] = useState<any>({});
   const [query, setQuery] = useState<any>({});
+  const [url, setUrl] = useState<string>('');
+  const [urlDialogVisible, setUrlDialogVisible] = useState<boolean>(false);
+
   const drawerRef = useRef({
   const drawerRef = useRef({
     open: () => {},
     open: () => {},
     close: () => {},
     close: () => {},
@@ -92,11 +138,26 @@ const ButtonForm: React.FC<ButtonFormProps> = (props) => {
         return `${item.name}=${getParaVal(item.value, record)}`;
         return `${item.name}=${getParaVal(item.value, record)}`;
       });
       });
       if (btnSchema.type === 'URL') {
       if (btnSchema.type === 'URL') {
-        doBtnJump(btnSchema, record, params);
+        //TODO，开发者模式下才有，不完善。 for 易才项目 from 史婷婷
+        if (btnSchema?.link?.openType === 'DIALOG') {
+          const _url = btnSchema?.link?.url;
+          if (_url) {
+            try {
+              const _urlArr = _url.split('?');
+              _urlArr[1] = params.join('&') + (_urlArr[1] ? '&' : '') + _urlArr[1];
+              setUrl(_urlArr.join('?'));
+              setUrlDialogVisible(true);
+            } catch (e) {
+              console.log(e);
+            }
+          }
+        } else {
+          doBtnJump(btnSchema, record, params);
+        }
         return;
         return;
       }
       }
       if (btnSchema.type === 'FORM_PAGE' && btnSchema.link) {
       if (btnSchema.type === 'FORM_PAGE' && btnSchema.link) {
-        console.log('FORM_PAGE!!!!!!!!!!');
+        // console.log('FORM_PAGE!!!!!!!!!!');
         const mcode = btnSchema.link.methodCode;
         const mcode = btnSchema.link.methodCode;
 
 
         if (mcode) method[mcode].call(null, btnSchema.link, params);
         if (mcode) method[mcode].call(null, btnSchema.link, params);
@@ -166,8 +227,17 @@ const ButtonForm: React.FC<ButtonFormProps> = (props) => {
         type={'add'}
         type={'add'}
         // onAfterSave={props.onAfterSave}
         // onAfterSave={props.onAfterSave}
       /> */}
       /> */}
+      <UrlDialog
+        visible={urlDialogVisible}
+        onVisibleChange={(visible: boolean) => {
+          setUrlDialogVisible(visible);
+        }}
+        title={props?.title || ''}
+        url={url}
+      />
     </div>
     </div>
   );
   );
 };
 };
 
 
 export default ButtonForm;
 export default ButtonForm;
+