@jiangood/open-admin 3.0.13 → 3.0.15

package/package.json

@@ -49,5 +49,5 @@
     "test:e2e": "playwright test",
     "test:e2e:ui": "playwright test --ui"
   },
-  "version": "3.0.13"
+  "version": "3.0.15"
 }

package/src/framework/fields/FieldDateRange/index.tsx

@@ -108,6 +108,10 @@ export class FieldDateRange extends React.Component<FieldDateRangeProps> {
     }
 
     dateToStr(dateArr: [dayjs.Dayjs | null, dayjs.Dayjs | null] | null, fmt: string): string {
+        if (dateArr == null) {
+            return "";
+        }
+
         const arr = dateArr as [dayjs.Dayjs | null, dayjs.Dayjs | null];
         const d1 = arr[0];
         const d2 = arr[1];

package/src/framework/fields/FieldEditor/index.tsx

@@ -56,6 +56,7 @@ export class FieldEditor extends React.Component<FieldEditorProps, {loading: boo
                     language: 'zh_CN',
                     height: height,
                     images_upload_url: uploadUrl,
+                    convert_urls: false,
                     promotion: false,
                     cache_suffix: '?v=v7.7',
                     plugins: [

package/src/framework/fields/FieldUploadImage/index.tsx

@@ -365,7 +365,7 @@ export class FieldUploadImage extends React.Component<FieldUploadImageProps, Fie
             fd.append('file', this.state.preview.cFile);
             fd.append('thumb', tFile);
             fd.append('isPublic', String(this.state.isPublic));
-            const rs = await HttpUtils.post('admin/sysFile/uploadImage', fd, null, {headers: {'Content-Type': 'multipart/form-data'}});
+            const rs = await HttpUtils.post('admin/sysFile/uploadImage', fd);
             const newNames = [...this.state.objectNames, rs.objectName];
             this.setState({objectNames: newNames});
             this.props.onChange?.(newNames.join(','));

package/src/framework/utils/UrlUtils.ts

@@ -66,6 +66,7 @@ export class UrlUtils {
      */
     static contextPath(path: string): string {
         const base = import.meta.env.VITE_SERVER_SERVLET_CONTEXT_PATH;
-        return base + path;
+        if (base === '/' || base === '') return path;
+        return base.replace(/\/+$/, '') + path;
     }
 }

package/src/framework/utils/system/HttpUtils.ts

@@ -21,6 +21,12 @@ export class HttpUtils {
         const url = config.url as string;
         config.url = url.startsWith('admin') ? '/' + url : url;
 
+        // FormData 请求交由浏览器自动生成带 boundary 的 multipart Content-Type，
+        // 否则手动指定 Content-Type 会缺失 boundary 导致后端解析失败
+        if (typeof FormData !== 'undefined' && config.data instanceof FormData) {
+            config.headers = {...config.headers, 'Content-Type': undefined};
+        }
+
         return new Promise<T>((resolve, reject) => {
             axiosInstance(config).then((response) => {
                 const body = response.data;

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

@@ -1,5 +1,5 @@
 import {DeleteOutlined, EditOutlined, PlusOutlined} from '@ant-design/icons';
-import {AutoComplete, Button, Card, Descriptions, Empty, Form, Input, InputNumber, Popconfirm, Splitter, Tree, Tag, TreeSelect, Typography} from 'antd';
+import {AutoComplete, Button, Card, Descriptions, Empty, Form, Input, InputNumber, Splitter, Tree, Tag, TreeSelect, Typography} from 'antd';
 import React from 'react';
 import {
     PermActions,
@@ -168,7 +168,9 @@ export default class extends React.Component {
                           size='small'
                           title={<div style={{display: 'flex', justifyContent: 'space-between', alignItems: 'center'}}>
                               <Typography.Text strong>字典类型</Typography.Text>
-                              <Button size='small' perm='sys-dict:create' icon={<PlusOutlined/>} onClick={this.handleTypeAdd}>新增类型</Button>
+                              <PermActions size='small' actions={[
+                                  {label: '新增类型', perm: 'sys-dict:create', icon: <PlusOutlined/>, onClick: this.handleTypeAdd},
+                              ]}/>
                           </div>}
                     >
                         <Tree
@@ -188,14 +190,16 @@ export default class extends React.Component {
                         <div style={{display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 8}}>
                             <Typography.Text strong>类型信息</Typography.Text>
                             {hasTypeSelected && (
-                                <span>
-                                    <Button size='small' icon={<EditOutlined/>} perm='sys-dict:update'
-                                            onClick={this.handleTypeEdit} style={{marginRight: 4}}>编辑</Button>
-                                    <Popconfirm perm='sys-dict:delete' title='是否确定删除此类型及其所有子类型和字典项？'
-                                                onConfirm={this.handleTypeDelete}>
-                                        <Button size='small' icon={<DeleteOutlined/>}>删除</Button>
-                                    </Popconfirm>
-                                </span>
+                                <PermActions size='small' actions={[
+                                    {label: '编辑', perm: 'sys-dict:update', icon: <EditOutlined/>, onClick: this.handleTypeEdit},
+                                    {
+                                        label: '删除',
+                                        perm: 'sys-dict:delete',
+                                        icon: <DeleteOutlined/>,
+                                        confirm: '是否确定删除此类型及其所有子类型和字典项？',
+                                        onClick: this.handleTypeDelete,
+                                    },
+                                ]}/>
                             )}
                         </div>
                         {hasTypeSelected && <Descriptions size='small' column={3}>

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

@@ -1,5 +1,5 @@
 import {DeleteOutlined, EditOutlined, PlusOutlined, SettingOutlined, SyncOutlined} from '@ant-design/icons';
-import {Button, Card, Checkbox, Descriptions, Form, Input, InputNumber, Popconfirm, Popover, Space, Spin, Splitter, Switch, Tree, Typography} from 'antd';
+import {Button, Card, Checkbox, Descriptions, Form, Input, InputNumber, Popover, Space, Spin, Splitter, Switch, Tree, Typography} from 'antd';
 import React from 'react';
 import {
     FieldBoolean,
@@ -10,6 +10,7 @@ import {
     HttpUtils,
     NamedIcon,
     Page,
+    PermActions,
     ViewSwitch,
 } from "../../../framework";
 
@@ -145,14 +146,16 @@ export default class extends React.Component {
                         <div style={{display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: 8}}>
                             <Typography.Text strong>机构信息</Typography.Text>
                             {selectedOrg && (
-                                <span>
-                                    <Button size='small' icon={<EditOutlined/>} perm='sys-org:update'
-                                            onClick={this.handleEdit} style={{marginRight: 4}}>编辑</Button>
-                                    <Popconfirm perm='sys-org:delete' title='是否确定删除组织机构'
-                                                onConfirm={this.handleDelete}>
-                                        <Button size='small' icon={<DeleteOutlined/>}>删除</Button>
-                                    </Popconfirm>
-                                </span>
+                                <PermActions size='small' actions={[
+                                    {label: '编辑', perm: 'sys-org:update', icon: <EditOutlined/>, onClick: this.handleEdit},
+                                    {
+                                        label: '删除',
+                                        perm: 'sys-org:delete',
+                                        icon: <DeleteOutlined/>,
+                                        confirm: '是否确定删除组织机构',
+                                        onClick: this.handleDelete,
+                                    },
+                                ]}/>
                             )}
                         </div>
                         {selectedOrg && (