@jiangood/open-admin 3.0.11 → 3.0.13

package/src/pages/system/job/index.jsx

@@ -13,7 +13,7 @@ import {
     Tag
 } from 'antd'
 import {PlusOutlined} from "@ant-design/icons";
-import {FormModal, HttpUtils, Page, PermActions, ProTable, StringUtils, UrlUtils, ValueType} from "../../../framework";
+import {FormModal, HttpUtils, Page, PermActions, ProTable, UrlUtils, ValueType} from "../../../framework";
 
 
 const cronOptions = [
@@ -61,7 +61,7 @@ export default class extends React.Component {
         HttpUtils.get('admin/job/job-class-options').then(rs => {
             this.setState({jobClassOptions: rs})
         }).catch(e => {
-            console.error('[Job] 加载作业类选项失败:', e);
+            console.error('[Job] 加载任务类选项失败:', e);
         })
     }
 
@@ -79,7 +79,7 @@ export default class extends React.Component {
         HttpUtils.post("admin/job/get-job-param-fields", jobData || {}, {className}).then(rs => {
             this.setState({paramList: rs})
         }).catch(e => {
-            console.error('[Job] 加载作业参数字段失败:', e);
+            console.error('[Job] 加载任务参数字段失败:', e);
         })
     }
 
@@ -91,12 +91,12 @@ export default class extends React.Component {
     }
 
     handleDelete = row => {
-        const hide = message.loading("删除作业中...")
+        const hide = message.loading("删除任务中...")
         HttpUtils.post('admin/job/delete', {id: row.id}).then(rs => {
             hide();
             this.tableRef.current.reload();
         }).catch(e => {
-            console.error('[Job] 删除作业失败:', e);
+            console.error('[Job] 删除任务失败:', e);
             hide();
         })
     }
@@ -105,7 +105,7 @@ export default class extends React.Component {
         HttpUtils.post('admin/job/trigger-job', {id: row.id}).then(rs => {
             this.tableRef.current.reload();
         }).catch(e => {
-            console.error('[Job] 触发作业失败:', e);
+            console.error('[Job] 触发任务失败:', e);
         })
     }
 
@@ -117,8 +117,7 @@ export default class extends React.Component {
         },
         {
             title: '执行类',
-            dataIndex: 'jobClass',
-
+            dataIndex: 'jobClassName',
         },
 
         {
@@ -181,7 +180,7 @@ export default class extends React.Component {
 
 
     render() {
-        return <Page title="作业调度" description="管理定时作业任务">
+        return <Page>
             <ProTable
                 actionRef={this.tableRef}
                 toolBarRender={() => (
@@ -205,11 +204,11 @@ export default class extends React.Component {
             />
 
 
-            <FormModal ref={this.modalRef} title='作业调度' width={800}
+            <FormModal ref={this.modalRef} title='定时任务' width={800}
                        onFinish={this.onFinish}
                        onValuesChange={this.onValuesChange}>
                 <Form.Item label='执行类' name='jobClass' rules={[{required: true}]}
-                           tooltip='org.quartz.Job接口，参考io.tmgg.job.builtin.DemoJob'>
+                           tooltip='继承 BaseJob，参考 HelloWorldJob'>
                     <Select options={this.state.jobClassOptions}/>
                 </Form.Item>
                 <Form.Item label='名称' name='name' rules={[{required: true}]}>
@@ -227,7 +226,7 @@ export default class extends React.Component {
 
                 {this.state.paramList?.map(p => (
                     <div key={p.name}>
-                        <Divider>作业参数</Divider>
+                        <Divider>任务参数</Divider>
                         <Form.Item label={p.label}
                                    name={['jobData', p.name]}
                                    key={p.name}
@@ -242,7 +241,7 @@ export default class extends React.Component {
                 ))}
             </FormModal>
 
-            <Modal title='作业调度状态'
+            <Modal title='定时任务状态'
                    open={this.state.statusOpen}
                    onCancel={() => this.setState({statusOpen: false})}
                    footer={null}
@@ -252,7 +251,7 @@ export default class extends React.Component {
 
             </Modal>
 
-            <Modal title='作业调度记录'
+            <Modal title='定时任务记录'
                    open={this.state.executeRecordOpen}
                    onCancel={() => this.setState({executeRecordOpen: false})}
                    footer={null}
@@ -311,8 +310,9 @@ export default class extends React.Component {
             const option = this.state.jobClassOptions.find(o => o.value === changed.jobClass)
             if (option) {
                 const {label} = option;
-                if (StringUtils.contains(label, " ")) { // 取中文名部门设置为name
-                    this.modalRef.current.formInstance.setFieldValue("name", label.split(" ")[1])
+                const match = label.match(/[（(](.*?)[）)]/);
+                if (match) { // 取括号内中文描述设置为name
+                    this.modalRef.current.formInstance.setFieldValue("name", match[1])
                 }
             }
         }

package/src/pages/userCenter/index.jsx

@@ -26,15 +26,7 @@ export default class extends React.Component {
     }
 
     pwdValidator = (rule, value) => {
-        return new Promise((resolve, reject) => {
-            HttpUtils.get("admin/sysUser/pwd-strength", {password: value}, {showError: false}).then(response => {
-                const rs = response.data
-                if (!rs.success) {
-                    reject(rs.message)
-                }
-                resolve()
-            })
-        })
+        return HttpUtils.get("admin/sysUser/pwd-strength", {password: value}, {showError: false})
     }
 
     render() {