Merge branch 'master' of https://g.civnet.cn:8443/ReactWeb5/maintenance

package.json

@@ -127,7 +127,7 @@
         "js-calendar-converter": "0.0.4",
         "lodash": "4.17.11",
         "minimist": "1.2.0",
-        "panda-xform": "5.9.9",
+        "panda-xform": "5.9.11",
         "parseForm": "^2.3.8",
         "prop-types": "15.7.2",
         "qrcode.react": "^3.1.0",

src/pages/platformCenter/scheduledTasks/components/AddModal.jsx

@@ -71,7 +71,7 @@ const AddModal = props => {
             : moment(new Date(new Date().toLocaleDateString()), 'YYYY-MM-DD 00:00:00');
         form.setFieldsValue({
           name: record.Name,
-          is_enable: record.Enabled,
+          is_enable: !record.Enabled,
           url_type: record.Absolute ? true : false,
           url_path: record.Url,
           request_header: record.CustomHeader,
@@ -98,7 +98,7 @@ const AddModal = props => {
                 .format('YYYY-MM-DD 00:00:00')
             : moment().format('YYYY-MM-DD 00:00:00');
         setExeTime(record.StartFrom ? record.StartFrom : startTimeValue);
-        setIsUse(record.Enabled);
+        setIsUse(!record.Enabled);
         changeLoopMode(record.LoopMode);
         setReenCheck(record.AllowReentrant);
         setPostCheck(record.UsePostState);
@@ -181,7 +181,7 @@ const AddModal = props => {
         UsePostState: fv.post_state,
         AllowReentrant: fv.reentrant,
         AllowLog: fv.enable_log,
-        Enabled: isUse,
+        Enabled: !isUse,
         Timeout: time_out ? parseInt(time_out) * 1000 : 30000,
         Absolute: fv.url_type,
         SiteInfo: null,

src/pages/platformCenter/scheduledTasks/index.jsx

@@ -126,9 +126,9 @@ const ScheduledTasks = () => {
       align: 'center',
       width: 150,
       render: (text, record) => {
-        if (text === true) {
+        if (text === false) {
           return <Tag color="blue">否</Tag>;
-        } else if (text === false) {
+        } else if (text === true) {
           return <Tag color="green">是</Tag>;
         }
         // return (