@jiangood/springboot-admin-starter 0.0.7 → 0.0.8

package/package.json

@@ -32,7 +32,7 @@
     "config/dist/*"
   ],
   "main": "src/index.ts",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "scripts": {
     "dev": "umi dev",
     "build": "tsc --outDir config/dist --skipLibCheck --noEmitOnError false config/index.ts"

package/src/framework/components/ProTable/index.jsx

@@ -7,6 +7,8 @@ import {StringUtils} from "../../utils";
 
 
 export class ProTable extends React.Component {
+
+
     state = {
         selectedRowKeys: [],
         selectedRows: [],
@@ -173,7 +175,7 @@ export class ProTable extends React.Component {
         if (!this.props.children) {
             return
         }
-        if (this.props.searchFormItemsRender) {
+        if (this.props["searchFormItemsRender"]) {
             throw new Error('不再支持 searchFormItemsRender，请直接放到ProTable的子节点')
         }
 
@@ -188,15 +190,17 @@ export class ProTable extends React.Component {
                         }
                     }}
                     style={{gap: '8px 0px'}}
-                    labelCol={{flex: '70px'}}
+                    labelCol={{flex: '80px'}}
+                    wrapperCol={{flex: '200px'}}
+                    className='search-form'
                 >
 
                     {this.props.children}
-
-                    <Form.Item style={{marginLeft: this.props.children.length > 2 ? 'auto' : 'inherit'}}>
+                    <div style={{marginLeft: '16px'}}>
                         <Button type='primary' htmlType="submit" icon={<SearchOutlined/>}> 查询
                         </Button>
-                    </Form.Item>
+                    </div>
+
                 </Form>
         </div>;
     };

package/src/framework/components/ProTable/index.less

@@ -1,2 +1,14 @@
 .tmgg-pro-table{
+  .search-form {
+    .ant-form-item {
+      margin: 0;
+    }
+
+    .form-item-double-width {
+      .ant-form-item-control {
+        flex: 0 0 480px !important;
+      }
+    }
+  }
 }
+

package/src/framework/components/view/ViewText.tsx

@@ -2,7 +2,7 @@ import React from "react";
 import {Typography} from "antd";
 
 interface ViewTextProps {
-    value: string | null | undefined;
+    value?: string;
 }
 
 export class ViewText extends React.Component<ViewTextProps, any>{

package/src/framework/utils/StorageUtils.ts

@@ -1,5 +1,3 @@
-import { DateUtils } from "./DateUtils";
-
 /**
  * 存储工具类
  * 使用 localStorage 进行数据的存取，并包含时间戳和默认值处理。
@@ -13,21 +11,13 @@ export class StorageUtils {
      * @returns 存储的值或默认值。
      */
     static get<T>(key: string, defaultValue: T | null = null): T | null {
-        // 尝试从 localStorage 获取原始字符串
         const vStr = localStorage.getItem(key);
-
-        // 如果没有存储项
         if (vStr == null) {
             return defaultValue;
         }
 
         try {
-            // 解析存储的项
-            const item: { createTime: number; data: T } = JSON.parse(vStr);
-
-            // 返回实际存储的数据
-            return item.data;
-
+            return JSON.parse(vStr);
         } catch (error) {
             // 如果 JSON 解析失败 (例如，存储的值不是一个包含 createTime 和 data 的有效 JSON 结构)
             console.error(`Error parsing storage item for key: ${key}`, error);
@@ -48,20 +38,13 @@ export class StorageUtils {
             return;
         }
 
-        // 构造包含时间戳的对象
-        const item = {
-            createTime: DateUtils.now(), // 假设 DateUtil.now() 返回 number 类型的时间戳
-            data: value
-        };
 
         try {
-            // 序列化对象
-            const dataStr = JSON.stringify(item);
-            // 存储到 localStorage
+            const dataStr = JSON.stringify(value);
             localStorage.setItem(key, dataStr);
         } catch (error) {
             // 捕获 JSON.stringify 错误 (例如，如果 value 包含循环引用)
-            console.error(`Error stringifying storage value for key: ${key}`, error);
+            console.error(`Error stringify storage value for key: ${key}`, error);
         }
     }
 }

package/src/layouts/index.jsx

@@ -5,12 +5,7 @@ import {ConfigProvider} from "antd";
 
 import {Outlet, withRouter} from "umi";
 import zhCN from 'antd/locale/zh_CN';
-import {
-    ArrUtils,
-    HttpUtils,
-    PageLoading, PageUtils,
-    SysUtils, ThemeUtils,
-} from "../framework";
+import {ArrUtils, HttpUtils, PageLoading, PageUtils, SysUtils, ThemeUtils,} from "../framework";
 import dayjs from 'dayjs';
 import 'dayjs/locale/zh-cn';
 
@@ -82,24 +77,6 @@ class _Layouts extends React.Component {
 
 
 
-    renderContent = () => {
-        if (this.state.siteInfoLoading) {
-            return <PageLoading message='加载站点信息...'/>
-        }
-        let {params = {}} = this.props.location;
-        console.log('layout: params', params)
-        let simple = this.isSimplePage();
-        if (simple || params.hasOwnProperty('_noLayout')) {
-            return <Outlet/>
-        }
-
-        if (!this.state.loginInfoFinish) {
-            return <PageLoading message='加载登录信息...'/>
-        }
-
-
-        return <AdminLayout path={this.state.path} logo={this.props.logo}/>
-    };
 
 
     render() {
@@ -146,8 +123,29 @@ class _Layouts extends React.Component {
         </ConfigProvider>
     }
 
+    renderContent = () => {
+        if (this.state.siteInfoLoading) {
+            return <PageLoading message='加载站点信息...'/>
+        }
+        let {params = {}} = this.props.location;
+        console.log('layout: params', params)
+        let simple = this.isSimplePage();
+        if (simple || params.hasOwnProperty('_noLayout')) {
+            return <Outlet/>
+        }
+
+        if (!this.state.loginInfoFinish) {
+            return <PageLoading message='加载登录信息...'/>
+        }
 
 
+        return <AdminLayout path={this.state.path} logo={this.props.logo}/>
+    };
+
+    renderMessages = () => {
+
+    };
+
 }
 
 export const Layouts = withRouter(_Layouts);

package/src/pages/index.jsx

@@ -6,6 +6,9 @@ export default class extends React.Component {
 
     state = {}
 
+    componentDidMount() {
+    }
+
     render() {
 
         return <Card>

package/src/pages/system/role/perm.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import {Alert, Button, Card, Checkbox, Table, Typography} from "antd";
+import {Button, Card, Checkbox, Table, Typography} from "antd";
 import {SaveOutlined} from "@ant-design/icons";
 import {ArrUtils, HttpUtils, PageUtils} from "../../../framework";
 
@@ -22,21 +22,18 @@ export default class extends React.Component {
 
         {
             title: '权限',
-            dataIndex: 'perms',
-            render: (perms, record) => {
-                if (perms == null) {
-                    if (record.path) {
-                        return <Alert type='error' message='错误：无按钮权限，请在application-data-**.yml中添加'/>
-                    }
-                    // 文件夹
+            dataIndex: 'permCodes',
+            render: (permCodes, record) => {
+                if (permCodes == null) {
                     return
                 }
-                const options = perms.map(perm => {
-                    return {
-                        label: perm.name,
-                        value: perm.perm
-                    }
-                })
+                const {permNames} = record
+                const options = [];
+                for (let i = 0; i < permCodes.length; i++) {
+                    const label = permNames[i];
+                    const value = permCodes[i];
+                    options.push({label, value});
+                }
 
 
                 let rowSelectedKey = this.state.rowSelectedKeys[record.id];