对比方式

src/model/datamodel.js

@@ -512,6 +512,14 @@ export function* getCompareJobModelStates() {
   return yield call(datamodelerService.getCompareJobModelStates)
 }
 
+export function* getModelCompareJobCompareTypes() {
+  return yield call(datamodelerService.getModelCompareJobCompareTypes)
+}
+
+export function* getStrategyItemPropertyTypes() {
+  return yield call(datamodelerService.getStrategyItemPropertyTypes)
+}
+
 export function* getCompareJobCronCycleTypes() {
   return yield call(datamodelerService.getCompareJobCronCycleTypes)
 }
\ No newline at end of file

src/service/datamodeler.js

@@ -465,6 +465,14 @@ export function getCompareJobModelStates() {
   return GetJSON("/datamodeler/easyDataModelModelCompareJob/getModelStatusTypes")
 }
 
+export function getModelCompareJobCompareTypes() {
+  return GetJSON("/datamodeler/easyDataModelModelCompareJob/getModelCompareJobCompareTypes")
+}
+
+export function getStrategyItemPropertyTypes() {
+  return GetJSON("/datamodeler/easyDataModelModelCompareJob/getStrategyItemPropertyTypes")
+}
+
 export function getCompareJobCronCycleTypes() {
   return GetJSON("/datamodeler/easyDataModelModelCompareJob/getCronCycleTypes")
 }
\ No newline at end of file

src/view/Manage/ModelCompare/update-task.jsx

@@ -56,6 +56,7 @@ const FC = (props) => {
       const basicRows = await basicFormRef.current?.validate()
       const scheduleRows = await scheduleFormRef.current?.validate()
 
+      console.log('basicRows', basicRows)
       console.log('scheduleRows', scheduleRows)
       setWaiting(true)
       if (type === 'add') {
@@ -147,6 +148,8 @@ const BasicForm = React.forwardRef(function ({ type, task }, ref) {
   const [states, setStates] = React.useState()
   const [loadingModelStates, setLoadingModelStates] = React.useState(false)
   const [modelStates, setModelStates] = React.useState()
+  const [loadingCompareTypes, setLoadingCompareTypes] = React.useState(false)
+  const [compareTypes, setCompareTypes] = React.useState()
   const [form] = Form.useForm()
 
   React.useImperativeHandle(ref, () => ({
@@ -161,16 +164,24 @@ const BasicForm = React.forwardRef(function ({ type, task }, ref) {
       
       rows.modelStatusTypes = (modelStates??[]).filter(item => (rows.modelStatusIds??[]).indexOf(item.id)!==-1)
 
+      if (rows.jobCompareTypeId) {
+        const index = (compareTypes??[]).findIndex(item => item.id === rows.jobCompareTypeId)
+        if (index !== -1) {
+          rows.jobCompareType = compareTypes[index]
+        }
+      }
+
       return rows
     },
-  }), [form, states, modelStates])
+  }), [form, states, modelStates, compareTypes])
 
   React.useEffect(() => {
     if (task) {
       form?.setFieldsValue({
         ...task, 
         jobStatusId: task?.jobStatusType?.id,
-        modelStatusIds: (task?.modelStatusTypes??[]).map(item => item.id)
+        modelStatusIds: (task?.modelStatusTypes??[]).map(item => item.id),
+        jobCompareTypeId: task?.jobCompareType?.id,
       })
     }
   }, [task])
@@ -178,6 +189,7 @@ const BasicForm = React.forwardRef(function ({ type, task }, ref) {
   React.useEffect(() => {
     getStates()
     getModelStates()
+    getCompareTypes()
   }, [])
 
   const marginBottom = React.useMemo(() => {
@@ -212,6 +224,20 @@ const BasicForm = React.forwardRef(function ({ type, task }, ref) {
     })
   }
 
+  const getCompareTypes = () => {
+    setLoadingCompareTypes(true)
+    dispatch({
+      type: 'datamodel.getModelCompareJobCompareTypes',
+      callback: data => {
+        setLoadingCompareTypes(false)
+        setCompareTypes(data)
+      },
+      error: () => {
+        setLoadingCompareTypes(false)
+      }
+    })
+  }
+
   const onValuesChange = (changedValues, allValues) => {
 
   }
@@ -285,6 +311,22 @@ const BasicForm = React.forwardRef(function ({ type, task }, ref) {
         </Col>
         <Col span={12}>
           <Form.Item
+            label="对比方式"
+            name="jobCompareTypeId"
+            style={{ marginBottom }}
+            rules={[{ required: true, message: '请选择对比方式!' }]}
+          >
+            { (type==='detail') ? <LabelItem title={task?.jobCompareType?.name} /> : <Select 
+              placeholder='请选择对比方式' 
+              loading={loadingCompareTypes}
+              allowClear
+            >
+              {compareTypes?.map(item => <Select.Option key={item.id} value={item.id}>{item.name}</Select.Option>)}
+            </Select> }
+          </Form.Item>
+        </Col>
+        <Col span={12}>
+          <Form.Item
             label="自动更新模型状态"
             name="autoUpdateModel"
             style={{ marginBottom }}