From 7d7968a6bcdf6dedc9a1935f9fb87d0362188239 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3=E9=91=AB?= <695997094@qq.com>
Date: Tue, 26 Nov 2024 14:09:31 +0800
Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Config/Components/Button/ButtonModal.tsx  |  13 +-
 src/components/Directory/index.tsx            |   1 +
 src/executor/open/form/detail/index.tsx       |   1 +
 src/executor/tools/editModal/index.tsx        |   4 +-
 .../tools/editModal/workSelectModal.tsx       | 114 ++++++++++++++++++
 src/executor/tools/task/start/default.tsx     |  36 +++++-
 src/executor/tools/workForm/detail.tsx        |  22 ++++
 src/executor/tools/workForm/index.tsx         |   3 +
 src/executor/tools/workForm/primary.tsx       |  53 +++++++-
 src/ts/base/model.ts                          |   2 +-
 src/ts/core/thing/standard/form.ts            |   1 +
 11 files changed, 235 insertions(+), 15 deletions(-)
 create mode 100644 src/executor/tools/editModal/workSelectModal.tsx

diff --git a/src/components/Common/FlowDesign/Config/Components/Button/ButtonModal.tsx b/src/components/Common/FlowDesign/Config/Components/Button/ButtonModal.tsx
index 85319ab65..a7c4770ac 100644
--- a/src/components/Common/FlowDesign/Config/Components/Button/ButtonModal.tsx
+++ b/src/components/Common/FlowDesign/Config/Components/Button/ButtonModal.tsx
@@ -170,11 +170,12 @@ const ButtonModal: React.FC<IProps> = (props) => {
                 options={[
                   { label: '手动规则', value: 'rule' },
                   { label: '手动执行器', value: 'executor' },
+                  { label: '获取办事数据', value: 'getWorkData' },
                 ]}
                 onSelect={setType}
               />
             </Form.Item>
-            {type == 'rule' ? (
+            {type === 'rule' ? (
               <Form.Item label="规则" name="ruleId" required>
                 <Select
                   options={rules.map((r) => ({
@@ -183,16 +184,16 @@ const ButtonModal: React.FC<IProps> = (props) => {
                   }))}
                 />
               </Form.Item>
-            ) : (
+            ) : type === 'executor' ? (
               <Form.Item label="执行器" name="executorId" required>
                 <Select
-                  options={executors.map((r) => ({
-                    label: r.funcName,
-                    value: r.id,
+                  options={executors.map((e) => ({
+                    label: e.funcName,
+                    value: e.id,
                   }))}
                 />
               </Form.Item>
-            )}
+            ) : null}
           </>
         )}
       </Form>
diff --git a/src/components/Directory/index.tsx b/src/components/Directory/index.tsx
index 2f983803e..2928ed17c 100644
--- a/src/components/Directory/index.tsx
+++ b/src/components/Directory/index.tsx
@@ -57,6 +57,7 @@ const Directory: React.FC<IProps> = ({ root }) => {
         }
         return true;
       });
+      console.log(data, 'data===>');
       if (file.key === directory.key) {
         setLoaded(true);
         setContent(data);
diff --git a/src/executor/open/form/detail/index.tsx b/src/executor/open/form/detail/index.tsx
index f66e5db11..fb3c23877 100644
--- a/src/executor/open/form/detail/index.tsx
+++ b/src/executor/open/form/detail/index.tsx
@@ -18,6 +18,7 @@ interface IProps {
  * @returns
  */
 const ThingView: React.FC<IProps> = (props) => {
+  console.log(props, 'props=====>');
   const ThingActive = localStorage.getItem('activeView');
   const [activeTabKey, setActiveTabKey] = useState(ThingActive ? ThingActive : 'card');
 
diff --git a/src/executor/tools/editModal/index.tsx b/src/executor/tools/editModal/index.tsx
index 65eb456e8..cf05266ed 100644
--- a/src/executor/tools/editModal/index.tsx
+++ b/src/executor/tools/editModal/index.tsx
@@ -2,10 +2,12 @@ import FormEditModal from './formEditModal';
 import FormSelectModal from './formSelectModal';
 import SummaryFormModal from './summaryFormModal';
 import MapSelectModal from './mapSelectModal';
+import WorkSelectModal from './workSelectModal';
 
 export const EditModal = {
   showFormEdit: FormEditModal,
   showFormSelect: FormSelectModal,
   SummaryFormModal: SummaryFormModal,
-  mapSelectModal: MapSelectModal
+  mapSelectModal: MapSelectModal,
+  workSelectModal: WorkSelectModal,
 };
diff --git a/src/executor/tools/editModal/workSelectModal.tsx b/src/executor/tools/editModal/workSelectModal.tsx
new file mode 100644
index 000000000..56575b7e4
--- /dev/null
+++ b/src/executor/tools/editModal/workSelectModal.tsx
@@ -0,0 +1,114 @@
+import EntityIcon from '@/components/Common/GlobalComps/entityIcon';
+import GenerateThingTable from '@/executor/tools/generate/thingTable';
+import { model, schema } from '@/ts/base';
+import { IBelong } from '@/ts/core';
+import { message, Modal } from 'antd';
+import CustomStore from 'devextreme/data/custom_store';
+import React, { useState } from 'react';
+import * as config from '../../open/form/config';
+import { Form } from '@/ts/core/thing/standard/form';
+import useAsyncLoad from '@/hooks/useAsyncLoad';
+import { userFormatFilter } from '@/utils/tools';
+import orgCtrl from '@/ts/controller';
+
+interface IProps {
+  form: schema.XForm;
+  belong: IBelong;
+  onSave: (values: model.InstanceDataModel | undefined) => void;
+}
+
+/** 获取办事信息 */
+const WorkSelectModal = ({ form, belong, onSave }: IProps) => {
+  const editData: { rows: schema.XThing[] } = { rows: [] };
+  let instanceData: model.InstanceDataModel | undefined = undefined;
+  const metaForm = new Form(form, belong.directory);
+
+  const FormBrower: React.FC = () => {
+    const [selectMenu, setSelectMenu] = useState<any>();
+
+    const [loaded] = useAsyncLoad(async () => {
+      await metaForm.loadFields();
+      const menuData = config.loadSpeciesItemMenu(metaForm);
+      setSelectMenu(menuData);
+    });
+
+    if (!selectMenu && !loaded) return <></>;
+
+    const loadContent = () => {
+      return (
+        <GenerateThingTable
+          key={metaForm.key}
+          height={'70vh'}
+          selection={{
+            mode: 'single',
+            allowSelectAll: true,
+            selectAllMode: 'page',
+            showCheckBoxesMode: 'always',
+          }}
+          pager={{ visible: true }}
+          form={metaForm.metadata}
+          fields={metaForm.fields}
+          onSelectionChanged={(e) => {
+            editData.rows = e.selectedRowsData;
+          }}
+          onRowDblClick={async (e: any) => {
+            const instance = Object.values(e.data?.archives).at(
+              -1,
+            ) as unknown as schema.XWorkInstance;
+            const detail = await orgCtrl.work.loadInstanceDetail(
+              instance.id,
+              instance.shareId,
+              instance.belongId,
+            );
+            if (detail) {
+              const data = JSON.parse(detail?.data || '{}');
+              instanceData = data;
+            } else {
+              message.warning('未查询到办事信息！');
+            }
+          }}
+          dataSource={
+            new CustomStore({
+              key: 'id',
+              async load(loadOptions: any) {
+                loadOptions.filter = await userFormatFilter(loadOptions.filter, metaForm);
+                loadOptions.filter = metaForm.parseFilter(loadOptions.filter);
+                loadOptions.userData = [];
+                if (selectMenu?.item?.value) {
+                  loadOptions.userData.push(selectMenu?.item.value);
+                } else if (selectMenu?.item?.code) {
+                  loadOptions.options = loadOptions.options || {};
+                  loadOptions.options.match = loadOptions.options.match || {};
+                  loadOptions.options.match[selectMenu?.item.code] = { _exists_: true };
+                }
+                return await metaForm.loadThing(loadOptions);
+              },
+            })
+          }
+          remoteOperations={true}
+          toolbar={{
+            visible: true,
+            items: [],
+          }}
+        />
+      );
+    };
+    return <React.Fragment>{loadContent()}</React.Fragment>;
+  };
+
+  const modal = Modal.confirm({
+    icon: <EntityIcon entityId={metaForm.id} showName />,
+    width: '90vw',
+    okText: `确认选择`,
+    className: 'selects-modal',
+    cancelText: '关闭',
+    onCancel: () => modal.destroy(),
+    content: <FormBrower />,
+    onOk: () => {
+      modal.destroy();
+      onSave(instanceData);
+    },
+  });
+};
+
+export default WorkSelectModal;
diff --git a/src/executor/tools/task/start/default.tsx b/src/executor/tools/task/start/default.tsx
index aca6c5d7e..aee515db5 100644
--- a/src/executor/tools/task/start/default.tsx
+++ b/src/executor/tools/task/start/default.tsx
@@ -3,7 +3,7 @@ import FormValidateMessage from '@/components/Common/Validate/FormValidateMessag
 import FormItem from '@/components/DataStandard/WorkForm/Viewer/formItem';
 import Confirm from '@/executor/open/reconfirm';
 import WorkForm from '@/executor/tools/workForm';
-import { command } from '@/ts/base';
+import { command, model, schema } from '@/ts/base';
 import {
   FieldModel,
   NodeCodeRule,
@@ -36,6 +36,7 @@ import { CloseOutlined, DownOutlined } from '@ant-design/icons';
 import PrintConfigModal from '@/components/Common/FlowDesign/Config/Components/PrintNode/PrintModal';
 import { createRoot } from 'react-dom/client';
 import PrintTemplate from '@/components/Common/FlowDesign/Config/Components/PrintNode/printTemplate';
+import { EditModal } from '../../editModal';
 
 // 卡片渲染
 interface IProps {
@@ -73,6 +74,7 @@ const DefaultWayStart: React.FC<IProps> = ({
   const [resource, setResource] = useState<any>();
   const [ser, setSer] = useState<any>();
   const [printModal, setPrintModal] = useState(false);
+  const [instanceData, setInstanceData] = useState<model.InstanceDataModel>();
   const service = useRef(
     new WorkFormService(apply.target, apply.instanceData, true, apply.reception),
   );
@@ -127,6 +129,15 @@ const DefaultWayStart: React.FC<IProps> = ({
     return reception.metadata.content;
   }, [reception]);
 
+  function updateData(obj1: schema.XThing, obj2: schema.XThing) {
+    for (let key in obj2) {
+      if (obj1.hasOwnProperty(key)) {
+        obj1[key] = obj2[key];
+      }
+    }
+    return obj1;
+  }
+
   async function handleClick(current: WorkNodeButton) {
     const node = apply.instanceData.node;
     try {
@@ -146,6 +157,21 @@ const DefaultWayStart: React.FC<IProps> = ({
           console.warn('不支持规则 ' + rule.type);
           return;
         }
+      } else if (current.type == 'getWorkData') {
+        EditModal.workSelectModal({
+          form: current.form?.metadata!,
+          belong: apply.target.space,
+          onSave: (values: model.InstanceDataModel | undefined) => {
+            if (values) {
+              const res = updateData(
+                apply.instanceData.data[apply.primaryForms[0].id][0].after.at(-1)!,
+                values.data[values.node.primaryForms[0].id][0].after.at(-1)!,
+              );
+              apply.instanceData.data[apply.primaryForms[0].id][0].after[0] = res;
+              setInstanceData(values);
+            }
+          },
+        });
       } else {
         message.warn('暂不支持执行器');
       }
@@ -313,6 +339,7 @@ const DefaultWayStart: React.FC<IProps> = ({
             nodeId={apply.instanceData.node.id}
             service={service.current}
             splitDetailFormId={splitDetailFormId}
+            instanceData={instanceData}
           />
         </div>
       </div>
@@ -566,12 +593,15 @@ const DefaultWayStart: React.FC<IProps> = ({
           <Button
             type="primary"
             onClick={async () => {
+              console.log(apply, 'lalaa===>');
               let errors = await service.current.validateAll();
               if (errors.some((e) => e.errorLevel == 'error')) {
                 message.error('校验失败');
               } else {
-                let reasonFlag = service.current.validate.validationInfo.some(e => !e.reason)
-                if(reasonFlag) return message.error('存在说明未填写');
+                let reasonFlag = service.current.validate.validationInfo.some(
+                  (e) => !e.reason,
+                );
+                if (reasonFlag) return message.error('存在说明未填写');
 
                 await filterFormRules();
                 var gateways = DealGatewayFields(apply);
diff --git a/src/executor/tools/workForm/detail.tsx b/src/executor/tools/workForm/detail.tsx
index bbc9d2efa..79be92d79 100644
--- a/src/executor/tools/workForm/detail.tsx
+++ b/src/executor/tools/workForm/detail.tsx
@@ -32,6 +32,7 @@ interface FormProps {
   allowLabelPrint?: boolean;
   service: WorkFormService;
   node: model.WorkNodeModel;
+  instanceData?: model.InstanceDataModel;
 }
 
 const DetailTable: React.FC<FormProps> = (props) => {
@@ -132,6 +133,25 @@ const DetailTable: React.FC<FormProps> = (props) => {
     };
   }, []);
 
+  useEffect(() => {
+    if (props.instanceData) {
+      const data =
+        props.instanceData.node.detailForms.length > 0
+          ? props.instanceData.data[props.instanceData.node.detailForms[0].id][0].after
+          : [];
+      generating(
+        props.service.belong,
+        form.name,
+        fields,
+        data,
+        formData.current,
+        () => setData({ ...formData.current }),
+        'allnew',
+        'allnew',
+      );
+    }
+  }, [props.instanceData]);
+
   const loadAutoFillData = async () => {
     const metaForm = new Form(form, props.service.belong.directory);
     const loadOptions = {
@@ -976,6 +996,7 @@ interface IProps {
   allowLabelPrint?: boolean;
   splitDetailFormId?: string;
   tabBarExtraContent?: TabBarExtraContent;
+  instanceData?: model.InstanceDataModel;
 }
 
 const DetailForms: React.FC<IProps> = (props) => {
@@ -1010,6 +1031,7 @@ const DetailForms: React.FC<IProps> = (props) => {
             allowLabelPrint={props.allowLabelPrint}
             node={props.node}
             service={props.service}
+            instanceData={props.instanceData}
           />
         ),
       });
diff --git a/src/executor/tools/workForm/index.tsx b/src/executor/tools/workForm/index.tsx
index 0b062bd03..f2e5f4d2e 100644
--- a/src/executor/tools/workForm/index.tsx
+++ b/src/executor/tools/workForm/index.tsx
@@ -18,6 +18,7 @@ interface IWorkFormProps {
   allowLabelPrint?: boolean;
   splitDetailFormId?: string;
   tabBarExtraContent?: TabBarExtraContent;
+  instanceData?: model.InstanceDataModel;
 }
 
 /** 流程节点表单 */
@@ -47,6 +48,7 @@ const WorkForm: React.FC<IWorkFormProps> = (props) => {
             service={service.current}
             node={node}
             tabBarExtraContent={props.tabBarExtraContent}
+            instanceData={props.instanceData}
           />
         )}
         {node.detailForms && node.detailForms.length > 0 && (
@@ -56,6 +58,7 @@ const WorkForm: React.FC<IWorkFormProps> = (props) => {
             node={node}
             allowLabelPrint={props.allowLabelPrint}
             splitDetailFormId={props.splitDetailFormId}
+            instanceData={props.instanceData}
           />
         )}
       </Space>
diff --git a/src/executor/tools/workForm/primary.tsx b/src/executor/tools/workForm/primary.tsx
index 5453bf307..cbe06d800 100644
--- a/src/executor/tools/workForm/primary.tsx
+++ b/src/executor/tools/workForm/primary.tsx
@@ -14,15 +14,58 @@ interface PrimaryFormType {
   info: model.FormInfo;
   service: WorkFormService;
   node: model.WorkNodeModel;
+  instanceData?: model.InstanceDataModel;
 }
 
 export const PrimaryForm: React.FC<PrimaryFormType> = (props) => {
   const service = useRefInit(() => new FormService(props.form, props.service));
+
+  function findDifferentValues(
+    obj1: schema.XThing | undefined,
+    obj2: schema.XThing | undefined,
+  ) {
+    function isNumericKey(key: string) {
+      return typeof key === 'string' && /^\d+$/.test(key);
+    }
+    const result = [];
+
+    for (const key in obj1) {
+      if (isNumericKey(key) && key !== '527635450022731776') {
+        if (obj2?.hasOwnProperty(key)) {
+          if (obj1[key] !== obj2[key]) {
+            result.push({
+              id: key,
+              value: obj2[key],
+            });
+          }
+        }
+      }
+    }
+
+    return result;
+  }
   const getData = () => {
-    let d = service.current.formData.after.at(-1);
-    if (d) {
-      props.service.updatePrimaryData(props.form.id, d);
-      service.current.initRules(d);
+    let d: schema.XThing | undefined;
+    if (props.instanceData) {
+      const res = findDifferentValues(
+        service.current.formData.after.at(-1),
+        props.instanceData.data[props.instanceData.node.primaryForms[0].id][0].after.at(
+          -1,
+        ),
+      );
+      res.forEach((item) => {
+        service.current.onValueChange(
+          item.id,
+          item.value,
+          service.current.formData.after.at(-1),
+        );
+      });
+    } else {
+      d = service.current.formData.after.at(-1);
+      if (d) {
+        props.service.updatePrimaryData(props.form.id, d);
+        service.current.initRules(d);
+      }
     }
     return d;
   };
@@ -68,6 +111,7 @@ interface IProps {
   service: WorkFormService;
   node: model.WorkNodeModel;
   tabBarExtraContent?: TabBarExtraContent;
+  instanceData?: model.InstanceDataModel;
 }
 
 const PrimaryForms: React.FC<IProps> = (props) => {
@@ -96,6 +140,7 @@ const PrimaryForms: React.FC<IProps> = (props) => {
             form={form}
             service={props.service}
             node={props.node}
+            instanceData={props.instanceData}
           />
         ),
       });
diff --git a/src/ts/base/model.ts b/src/ts/base/model.ts
index 8c9613af0..cf6db325f 100644
--- a/src/ts/base/model.ts
+++ b/src/ts/base/model.ts
@@ -963,7 +963,7 @@ interface WorkNodeForm {
 export interface WorkNodeButton {
   code: string;
   name: string;
-  type: 'rule' | 'executor';
+  type: 'rule' | 'executor' | 'getWorkData';
   icon?: string;
   /** 按钮排序 */
   order?: number;
diff --git a/src/ts/core/thing/standard/form.ts b/src/ts/core/thing/standard/form.ts
index 627910e87..c72b1fd7c 100644
--- a/src/ts/core/thing/standard/form.ts
+++ b/src/ts/core/thing/standard/form.ts
@@ -578,6 +578,7 @@ export class Form extends StandardFileInfo<schema.XForm> implements IForm {
     res.totalCount = res.totalCount ?? 0;
     res.groupCount = res.groupCount ?? 0;
     res.summary = Array.isArray(res.summary) ? res.summary : [];
+    console.log(res, 'res====>');
     return res;
   }
   //获取集群数据
-- 
Gitee


From ead8fd7925e7ed38d90ef134f9ce06a40352b998 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3=E9=91=AB?= <695997094@qq.com>
Date: Mon, 2 Dec 2024 13:53:59 +0800
Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/editModal/workSelectModal.tsx       |  4 +-
 src/executor/tools/uploadTemplate.tsx         | 88 +++++++++++++++++++
 src/executor/tools/workForm/detail.tsx        | 20 ++---
 3 files changed, 101 insertions(+), 11 deletions(-)

diff --git a/src/executor/tools/editModal/workSelectModal.tsx b/src/executor/tools/editModal/workSelectModal.tsx
index 56575b7e4..a8b40149f 100644
--- a/src/executor/tools/editModal/workSelectModal.tsx
+++ b/src/executor/tools/editModal/workSelectModal.tsx
@@ -55,8 +55,9 @@ const WorkSelectModal = ({ form, belong, onSave }: IProps) => {
             const instance = Object.values(e.data?.archives).at(
               -1,
             ) as unknown as schema.XWorkInstance;
+            e.component.beginCustomLoading('数据准备中...');
             const detail = await orgCtrl.work.loadInstanceDetail(
-              instance.id,
+              instance._id ?? instance.id,
               instance.shareId,
               instance.belongId,
             );
@@ -66,6 +67,7 @@ const WorkSelectModal = ({ form, belong, onSave }: IProps) => {
             } else {
               message.warning('未查询到办事信息！');
             }
+            e.component.endCustomLoading();
           }}
           dataSource={
             new CustomStore({
diff --git a/src/executor/tools/uploadTemplate.tsx b/src/executor/tools/uploadTemplate.tsx
index 4672ffe29..f688ff4b3 100644
--- a/src/executor/tools/uploadTemplate.tsx
+++ b/src/executor/tools/uploadTemplate.tsx
@@ -560,3 +560,91 @@ export const matching = (
     content: <Progressing />,
   });
 };
+
+export const insertData = (
+  belong: IBelong,
+  fieldsData: model.FieldModel[],
+  data: el.schema.XThing[],
+  formData: model.FormEditData,
+  finished: () => void,
+) => {
+  let matched: number = 0;
+  const Progressing = () => {
+    const [progress, setProgress] = useState(0);
+    useEffect(() => {
+      if (data.length > 0) {
+        loadThings().then((result) => {
+          for (const _item of result) {
+            matched++;
+            setProgress((matched * 100) / result.length);
+          }
+          modal.destroy();
+          finished();
+        });
+      } else {
+        message.error('数据格式不正确');
+        modal.destroy();
+      }
+    }, []);
+    return (
+      <div style={{ marginTop: 20 }}>
+        <Progress percent={progress} showInfo={false} />
+        <span>数据导入中...</span>
+      </div>
+    );
+  };
+  // 合并数据
+  const mergeData = (data: schema.XForm[], changeData: el.schema.XThing[]) => {
+    return data.map((item) => {
+      const curItem = changeData.find((i) => i['id'] === item['id']);
+      if (curItem) {
+        return {
+          ...item,
+          ...curItem,
+        };
+      }
+      return item;
+    });
+  };
+  /** 加载数据 */
+  const loadThings = async () => {
+    let resultData: schema.XForm[] = [];
+    const loadOptions: any = {};
+    loadOptions.userData = [];
+    loadOptions.options = {
+      match: {
+        id: { _in_: data.map((item) => item.id) },
+        isDeleted: false,
+      },
+    };
+    const formColl = belong.resource.genColl<schema.XForm>('_system-things');
+    const res = await formColl.loadResult(loadOptions);
+    if (res.success && !Array.isArray(res.data)) {
+      res.data = [];
+    }
+    const deepCloneData = _.cloneDeep(res.data);
+    const fields = FullThingColumns(fieldsData);
+    for (const item of deepCloneData) {
+      const newData: any = {};
+      fields.forEach((c) => {
+        if (item[c.code]) {
+          newData[c.id] = item[c.code];
+        }
+      });
+      if (formData.after.every((i) => i.id !== newData.id)) {
+        formData.after.unshift({ ...newData });
+      }
+    }
+    const result = mergeData(res.data, data);
+    resultData = result;
+    return resultData;
+  };
+  const modal = Modal.info({
+    icon: <></>,
+    okText: '关闭',
+    width: 610,
+    title: '导入数据中',
+    maskClosable: true,
+    content: <Progressing />,
+  });
+};
diff --git a/src/executor/tools/workForm/detail.tsx b/src/executor/tools/workForm/detail.tsx
index 79be92d79..d20264f05 100644
--- a/src/executor/tools/workForm/detail.tsx
+++ b/src/executor/tools/workForm/detail.tsx
@@ -4,7 +4,13 @@ import React from 'react';
 import { InputNumber, Modal, Tabs, message } from 'antd';
 import { EditModal } from '../editModal';
 import GenerateThingTable from '../generate/thingTable';
-import { Uploader, generating, showErrors, matching } from '../uploadTemplate';
+import {
+  Uploader,
+  generating,
+  showErrors,
+  matching,
+  insertData,
+} from '../uploadTemplate';
 import * as el from '@/utils/excel';
 import { XThing } from '@/ts/base/schema';
 import { AiFillCopy, AiFillEdit, AiFillRest } from 'react-icons/ai';
@@ -139,15 +145,8 @@ const DetailTable: React.FC<FormProps> = (props) => {
         props.instanceData.node.detailForms.length > 0
           ? props.instanceData.data[props.instanceData.node.detailForms[0].id][0].after
           : [];
-      generating(
-        props.service.belong,
-        form.name,
-        fields,
-        data,
-        formData.current,
-        () => setData({ ...formData.current }),
-        'allnew',
-        'allnew',
+      insertData(props.service.belong, fields, data, formData.current, () =>
+        setData({ ...formData.current }),
       );
     }
   }, [props.instanceData]);
@@ -916,6 +915,7 @@ const DetailTable: React.FC<FormProps> = (props) => {
                           }
                         });
                       }
+                      console.log(values, 'values====>');
                       setData({ ...formData.current });
                     },
                   });
-- 
Gitee


From 2ef732016210a11bcc7fa018f0a8f5439a22c96a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3=E9=91=AB?= <695997094@qq.com>
Date: Tue, 3 Dec 2024 13:46:34 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E5=88=A0=E9=99=A4console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Common/FlowDesign/Config/Components/Button/ButtonModal.tsx  | 2 +-
 src/components/Directory/index.tsx                              | 1 -
 src/executor/tools/task/start/default.tsx                       | 1 -
 src/executor/tools/workForm/detail.tsx                          | 1 -
 src/ts/core/thing/standard/form.ts                              | 1 -
 5 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/components/Common/FlowDesign/Config/Components/Button/ButtonModal.tsx b/src/components/Common/FlowDesign/Config/Components/Button/ButtonModal.tsx
index a7c4770ac..a9965eec3 100644
--- a/src/components/Common/FlowDesign/Config/Components/Button/ButtonModal.tsx
+++ b/src/components/Common/FlowDesign/Config/Components/Button/ButtonModal.tsx
@@ -170,7 +170,7 @@ const ButtonModal: React.FC<IProps> = (props) => {
                 options={[
                   { label: '手动规则', value: 'rule' },
                   { label: '手动执行器', value: 'executor' },
-                  { label: '获取办事数据', value: 'getWorkData' },
+                  { label: '获取业务数据', value: 'getWorkData' },
                 ]}
                 onSelect={setType}
               />
diff --git a/src/components/Directory/index.tsx b/src/components/Directory/index.tsx
index 2928ed17c..2f983803e 100644
--- a/src/components/Directory/index.tsx
+++ b/src/components/Directory/index.tsx
@@ -57,7 +57,6 @@ const Directory: React.FC<IProps> = ({ root }) => {
         }
         return true;
       });
-      console.log(data, 'data===>');
       if (file.key === directory.key) {
         setLoaded(true);
         setContent(data);
diff --git a/src/executor/tools/task/start/default.tsx b/src/executor/tools/task/start/default.tsx
index aee515db5..7ee3eead6 100644
--- a/src/executor/tools/task/start/default.tsx
+++ b/src/executor/tools/task/start/default.tsx
@@ -593,7 +593,6 @@ const DefaultWayStart: React.FC<IProps> = ({
           <Button
             type="primary"
             onClick={async () => {
-              console.log(apply, 'lalaa===>');
               let errors = await service.current.validateAll();
               if (errors.some((e) => e.errorLevel == 'error')) {
                 message.error('校验失败');
diff --git a/src/executor/tools/workForm/detail.tsx b/src/executor/tools/workForm/detail.tsx
index d20264f05..5226c384e 100644
--- a/src/executor/tools/workForm/detail.tsx
+++ b/src/executor/tools/workForm/detail.tsx
@@ -915,7 +915,6 @@ const DetailTable: React.FC<FormProps> = (props) => {
                           }
                         });
                       }
-                      console.log(values, 'values====>');
                       setData({ ...formData.current });
                     },
                   });
diff --git a/src/ts/core/thing/standard/form.ts b/src/ts/core/thing/standard/form.ts
index c72b1fd7c..627910e87 100644
--- a/src/ts/core/thing/standard/form.ts
+++ b/src/ts/core/thing/standard/form.ts
@@ -578,7 +578,6 @@ export class Form extends StandardFileInfo<schema.XForm> implements IForm {
     res.totalCount = res.totalCount ?? 0;
     res.groupCount = res.groupCount ?? 0;
     res.summary = Array.isArray(res.summary) ? res.summary : [];
-    console.log(res, 'res====>');
     return res;
   }
   //获取集群数据
-- 
Gitee


From b93a77f21eed36da7d4f8309dd304771c85af773 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E4=BD=B3=E9=91=AB?= <695997094@qq.com>
Date: Tue, 3 Dec 2024 14:51:11 +0800
Subject: [PATCH 4/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/executor/open/form/detail/index.tsx |  1 -
 src/executor/tools/workForm/primary.tsx | 35 ++++++++++---------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/executor/open/form/detail/index.tsx b/src/executor/open/form/detail/index.tsx
index fb3c23877..f66e5db11 100644
--- a/src/executor/open/form/detail/index.tsx
+++ b/src/executor/open/form/detail/index.tsx
@@ -18,7 +18,6 @@ interface IProps {
  * @returns
  */
 const ThingView: React.FC<IProps> = (props) => {
-  console.log(props, 'props=====>');
   const ThingActive = localStorage.getItem('activeView');
   const [activeTabKey, setActiveTabKey] = useState(ThingActive ? ThingActive : 'card');
 
diff --git a/src/executor/tools/workForm/primary.tsx b/src/executor/tools/workForm/primary.tsx
index cbe06d800..de5f23911 100644
--- a/src/executor/tools/workForm/primary.tsx
+++ b/src/executor/tools/workForm/primary.tsx
@@ -20,27 +20,20 @@ interface PrimaryFormType {
 export const PrimaryForm: React.FC<PrimaryFormType> = (props) => {
   const service = useRefInit(() => new FormService(props.form, props.service));
 
-  function findDifferentValues(
-    obj1: schema.XThing | undefined,
-    obj2: schema.XThing | undefined,
-  ) {
-    function isNumericKey(key: string) {
-      return typeof key === 'string' && /^\d+$/.test(key);
-    }
-    const result = [];
+  function findDifferentValues(obj1: schema.XThing, obj2: schema.XThing) {
+    const result: any[] = [];
+    const numericKeysObj1 = Object.keys(obj1).filter((key) => !isNaN(parseInt(key, 10)));
+    const numericKeysObj2 = Object.keys(obj2).filter((key) => !isNaN(parseInt(key, 10)));
+    const allNumericKeys = new Set([...numericKeysObj1, ...numericKeysObj2]);
 
-    for (const key in obj1) {
-      if (isNumericKey(key) && key !== '527635450022731776') {
-        if (obj2?.hasOwnProperty(key)) {
-          if (obj1[key] !== obj2[key]) {
-            result.push({
-              id: key,
-              value: obj2[key],
-            });
-          }
-        }
+    allNumericKeys.forEach((key) => {
+      if (obj1[key] !== obj2[key]) {
+        result.push({
+          id: key,
+          value: obj2[key],
+        });
       }
-    }
+    });
 
     return result;
   }
@@ -48,10 +41,10 @@ export const PrimaryForm: React.FC<PrimaryFormType> = (props) => {
     let d: schema.XThing | undefined;
     if (props.instanceData) {
       const res = findDifferentValues(
-        service.current.formData.after.at(-1),
+        service.current.formData.after.at(-1)!,
         props.instanceData.data[props.instanceData.node.primaryForms[0].id][0].after.at(
           -1,
-        ),
+        )!,
       );
       res.forEach((item) => {
         service.current.onValueChange(
-- 
Gitee