@jiangood/open-admin 3.1.1 → 3.1.2

package/package.json

@@ -59,7 +59,7 @@
     "test:e2e": "playwright test",
     "test:e2e:ui": "playwright test --ui"
   },
-  "version": "3.1.1",
+  "version": "3.1.2",
   "overrides": {
     "zod-validation-error": "^4.0.2"
   }

package/src/framework/components/ValueType/registry.tsx

@@ -1,4 +1,4 @@
-import {Input} from "antd";
+import {Input, InputNumber, Switch} from "antd";
 
 import {ViewPassword, ViewBoolean, ViewImage, ViewText} from "../../views";
 import {FieldDictSelect, FieldRemoteSelect} from "../../fields";
@@ -6,6 +6,14 @@ import {FieldDictSelect, FieldRemoteSelect} from "../../fields";
 
 export const fieldRegistry = {
     'text':Input,
+    'string': Input,
+
+    'number': InputNumber,
+
+    'boolean': Switch,
+
+    'img': Input,
+    'img_base64': Input,
 
     'dict':FieldDictSelect,
     'password':Input.Password,

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

@@ -231,8 +231,9 @@ export default class JobPage extends React.Component {
                                    name={['jobData', p.name]}
                                    key={p.name}
                                    initialValue={p.defaultValue}
+                                   valuePropName={p.valueType === 'boolean' ? 'checked' : 'value'}
                                    rules={[{required: p.required}]}>
-                            {ValueType.renderField(p.componentType, {
+                            {ValueType.renderField(p.valueType, {
                                 ...p.componentProps,
                                 placeholder: p.placeholder || '请输入'
                             })}

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

@@ -11,6 +11,7 @@ import {
     NamedIcon,
     Page,
     PermActions,
+    PermUtils,
     ViewSwitch,
 } from "../../../framework";
 
@@ -91,6 +92,7 @@ export default class OrgPage extends React.Component {
     render() {
         const {selectedOrg} = this.state
         const params = this.state.params
+        const canSort = PermUtils.hasPermission('sys-org:update')
 
         return <Page title="组织机构" description="管理组织机构树" actions={
             <Button type='primary' perm='sys-org:create' icon={<PlusOutlined/>} onClick={this.handleAdd}>新增</Button>
@@ -122,6 +124,7 @@ export default class OrgPage extends React.Component {
                                     <div>
                                         拖拽排序&nbsp;<Switch
                                         value={this.state.draggable}
+                                        disabled={!canSort}
                                         onChange={this.onDraggableChange}/>
                                     </div>
                                     <Button size='small' shape='round' icon={<SyncOutlined/>} onClick={this.loadTree}>刷新</Button>
@@ -224,6 +227,7 @@ export default class OrgPage extends React.Component {
     }
 
     onDrop = (e) => {
+        if (!PermUtils.hasPermission('sys-org:update')) return;
         const {dragNode, dropToGap, node} = e;
         const dropKey = node.key;
         const dragKey = dragNode.key;