@jiangood/springboot-admin-starter 0.0.3 → 0.0.5

package/config/dist/config.js

@@ -1,12 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var umi_1 = require("umi");
+var fs = require("fs");
+var path = require("path");
 //https://umijs.org/docs/api/config
 console.log('i am config.ts');
+console.log('__dirname', __dirname);
+console.log('process.cwd()', process.cwd());
+var isFramework = fs.existsSync(path.join(process.cwd(), 'config/plugins/route-plugin.ts'));
+console.log('isFramework', isFramework);
+var pluginDir = isFramework ? './config/plugins' : '@jiangood/springboot-admin-starter/config/dist/plugins';
+console.log('pluginDir', pluginDir);
 exports.default = (0, umi_1.defineConfig)({
     // 配置是否让生成的文件包含 hash 后缀，通常用于增量发布和避免浏览器加载缓存。
     hash: true,
     history: { type: 'hash' },
     // 复杂，还得设置忽略、编译等，先关掉
     mfsu: false,
+    plugins: [
+        pluginDir + '/form-plugin',
+        pluginDir + '/route-plugin',
+    ],
+    proxy: {
+        '/admin': {
+            target: 'http://127.0.0.1:8002',
+            changeOrigin: true,
+        },
+        '/preview': {
+            target: 'http://127.0.0.1:8002',
+            changeOrigin: true,
+        },
+        '/ureport': {
+            target: 'http://127.0.0.1:8002',
+            changeOrigin: true,
+            pathRewrite: { '^/ureport': '/ureport' },
+        },
+        '/ws-log-view': {
+            target: 'http://127.0.0.1:8002',
+            changeOrigin: true,
+            ws: true,
+        },
+    }
 });

package/config/dist/index.js

@@ -15,6 +15,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./config"), exports);
-__exportStar(require("./config.local"), exports);
 __exportStar(require("./plugins/route-plugin"), exports);
 __exportStar(require("./plugins/form-plugin"), exports);

package/config/dist/plugins/form-plugin.js

@@ -20,7 +20,7 @@ exports.default = (function (api) {
     api.logger.info('formRegistryPath', formRegistryPath);
     api.addEntryImports(function () { return ({
         source: formRegistryPath,
-        specifier: '{formRegistry}'
+        specifier: '{FormRegistryUtils}'
     }); });
     parseDir(api, path.join(api.paths.absSrcPath, 'forms'));
     if (!isFramework) {
@@ -45,7 +45,7 @@ function parseDir(api, dir) {
             specifier: name
         }); });
         // register form
-        api.addEntryCodeAhead(function () { return "formRegistry.register(\"".concat(name, "\",").concat(name, " );"); });
+        api.addEntryCodeAhead(function () { return "FormRegistryUtils.register(\"".concat(name, "\",").concat(name, " );"); });
         api.logger.info('formRegistry.register: ', name, source);
     });
 }

package/package.json

@@ -8,23 +8,21 @@
   },
   "peerDependencies": {
     "@ant-design/icons": "^5.4.0",
-    "@ant-design/v5-patch-for-react-19": "^1.0.3",
+    "@bpmn-io/properties-panel": "^3.34.0",
     "@tinymce/tinymce-react": "^6.0.0",
     "@umijs/types": "^3.5.43",
-    "antd": "^5.26.1",
+    "antd": "^6.0.0",
     "antd-img-crop": "^4.23.0",
+    "axios": "^1.13.2",
     "bpmn-js": "^18.7.0",
-    "dagre-d3": "^0.6.0",
+    "bpmn-js-properties-panel": "^5.43.0",
     "dayjs": "^1.11.13",
-    "echarts": "^5.6.0",
     "jsencrypt": "^3.5.4",
+    "lodash": "^4.17.21",
     "qs": "^6.14.0",
     "react": "^19.0.0",
-    "react-amap": "^1.2.8",
     "react-dom": "^19.0.0",
-    "react-lazylog": "^4.5.3",
-    "umi": "^4.0.0",
-    "axios": "^1.13.2"
+    "umi": "^4.0.0"
   },
   "name": "@jiangood/springboot-admin-starter",
   "description": "springboot-admin-starter",
@@ -32,8 +30,12 @@
     "src/*",
     "config/dist/*"
   ],
-  "main": "src/index.js",
-  "version": "0.0.3",
+  "main": "src/index.ts",
+  "version": "0.0.5",
+  "dependencies": {
+    "preact": "^10.27.2",
+    "preact-hooks": "0.0.0-0.0.0"
+  },
   "scripts": {
     "dev": "umi dev",
     "build": "tsc --outDir config/dist --skipLibCheck --noEmitOnError false config/index.ts"

package/src/forms/demoForm.jsx

@@ -1,16 +1,16 @@
-import {Form, Input} from "antd";
+import {Form, Input, InputNumber} from "antd";
 
 export default function (){
 
     return <div>
         demo表单示例
         <Form>
-            <Form.Item label="用户名">
+            <Form.Item label="事由">
                 <Input/>
             </Form.Item>
-            <Form.Item label="密码">
-                <Input/>
+            <Form.Item label="请假天数" name='days'>
+                <InputNumber/>
             </Form.Item>
         </Form>
     </div>
-}
+}

package/src/framework/components/DownloadFileButton.jsx

@@ -1,6 +1,6 @@
 import React from "react";
 import {Button, Modal, Spin} from "antd";
-import {HttpUtil} from "../system";
+import {HttpUtils} from "../utils";
 
 
 export class DownloadFileButton extends React.Component {
@@ -12,7 +12,7 @@ export class DownloadFileButton extends React.Component {
     onClick(){
         const {url, params, children, ...rest} = this.props;
         this.setState({open:true})
-        HttpUtil.downloadFile(url,params).then(rs=>{
+        HttpUtils.downloadFile(url,params).then(rs=>{
 
         }).finally(()=>{
             this.setState({open:false})

package/src/framework/components/Ellipsis.jsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import {Modal} from 'antd';
 import './Ellipsis.less'
-import {StrUtil} from "../utils";
+import {StringUtils} from "../utils";
 
 export class Ellipsis extends React.Component {
   static defaultProps = {length: 15}
@@ -17,7 +17,7 @@ export class Ellipsis extends React.Component {
     }
 
 
-    const shortText =  StrUtil.ellipsis(text, length)
+    const shortText =  StringUtils.ellipsis(text, length)
     return (
         <span className='ellipsis-text' onClick={this.showFull}>{shortText}</span>
     );

package/src/framework/components/LinkButton.d.ts

@@ -1,13 +1,13 @@
 // @ts-ignore
 import React from "react";
 
-declare type LinkButtonProps = {
+export interface LinkButtonProps {
     /**
      *   路径
      */
-    path: string,
-    label: string,
-    type?:'primary'|'default'|'dashed'|'link'|'text'|'ghost'
+    path: string;
+    label: string;
+    type?: 'primary' | 'default' | 'dashed' | 'link' | 'text' | 'ghost'
 };
 
 export class LinkButton extends React.Component<LinkButtonProps, any> {

package/src/framework/components/LinkButton.jsx

@@ -1,13 +1,10 @@
 import React from "react";
 import {Button} from "antd";
-import {PageUtil} from "../system";
+import {PageUtils} from "../utils";
 
-export class LinkButton extends React.Component {
-
-    render() {
-        const {path,label, children, size='small', ...rest} = this.props;
-        return <Button size={size} {...rest} onClick={()=>{
-            PageUtil.open(path,label)
-        }}>{children}</Button>
-    }
+export function LinkButton(props) {
+    const {path, label, children, size = 'small', ...rest} = props;
+    return <Button size={size} {...rest} onClick={() => {
+        PageUtils.open(path, label)
+    }}>{children}</Button>
 }

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

@@ -1,6 +1,6 @@
 import React from "react";
 import './index.less'
-import {theme} from "../../system";
+import {ThemeUtils} from "../../utils";
 
 /**
  * 上下间隔
@@ -18,7 +18,7 @@ export class Page extends React.Component {
             style.padding = 16
         }
         if(this.props.backgroundGray){
-            style.backgroundColor = theme["background-color"]
+            style.backgroundColor = ThemeUtils.getColor("background-color")
         }
 
 

package/src/framework/components/PageLoading.tsx

@@ -0,0 +1,27 @@
+import React from "react";
+import {Alert, Spin} from "antd";
+import {ThemeUtils} from "../utils";
+
+/**
+ * 页面加载中的动画
+ */
+export function PageLoading(props: { message?: string }) {
+    const msg = props.message || '页面加载中...';
+
+    return <div style={{
+        height: '100vh', width: '100%',
+        display: 'flex', alignItems: 'center', justifyContent: "center",
+        color: ThemeUtils.getColor("primary-color")
+    }}>
+        <div style={{textAlign: "center", marginTop: '-10rem'}}>
+            <div>
+                <Spin size={"large"}></Spin>
+            </div>
+            <div style={{marginTop: '1rem'}}>
+                <Alert title={msg}></Alert>
+            </div>
+
+
+        </div>
+    </div>
+}

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

@@ -5,8 +5,7 @@ import {HistoryOutlined, ReloadOutlined} from '@ant-design/icons';
 import {Button, Input, message, Modal, Table} from 'antd';
 import React from 'react';
 import './index.less';
-import {PageUtil} from "../../../../system";
-import {DateUtil, StorageUtil} from "../../../../utils";
+import {DateUtils, PageUtils, StorageUtils} from "../../../../utils";
 
 export default class Toolbar extends React.Component {
 
@@ -47,7 +46,7 @@ export default class Toolbar extends React.Component {
 
     renderHistory() {
         const {params} = this.props
-        const list = StorageUtil.get(this.getParamKey()) || []
+        const list = StorageUtils.get(this.getParamKey()) || []
 
         const dataSource = [{params, time: '当前'}, ...list]
 
@@ -94,7 +93,7 @@ export default class Toolbar extends React.Component {
     }
 
     getParamKey() {
-        return 'query-params-' + PageUtil.currentPathname();
+        return 'query-params-' + PageUtils.currentPathname();
     }
 
     onSaveHistory = () => {
@@ -104,13 +103,13 @@ export default class Toolbar extends React.Component {
             message.error('查询参数为空，无法保存')
             return
         }
-        const list = StorageUtil.get(this.getParamKey()) || []
-        let data = {time: DateUtil.now(), params};
+        const list = StorageUtils.get(this.getParamKey()) || []
+        let data = {time: DateUtils.now(), params};
         list.unshift(data)
         if (list.length > 5) {
             list.pop()
         }
-        StorageUtil.set(this.getParamKey(), list)
+        StorageUtils.set(this.getParamKey(), list)
         message.success('保存成功')
         this.setState({historyOpen: false})
     }

package/src/framework/components/ProTable/index.d.ts

@@ -4,9 +4,13 @@ import {ColumnsType} from "antd/es/table";
 
 declare type ProTableProps = {
     columns:  ColumnsType,
-    // 请求数据，注意：需处理下载
+    /**
+     * 请求函数
+      */
     request: (params:any)=>{};
 
+    rowKey?: string,
+
     // 选择行，通ant table
     rowSelection?: any,
 

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

@@ -3,7 +3,7 @@ import Toolbar from './components/ToolBar';
 import React from "react";
 import './index.less'
 import {SearchOutlined} from "@ant-design/icons";
-import {StrUtil} from "../../utils";
+import {StringUtils} from "../../utils";
 
 
 export class ProTable extends React.Component {
@@ -42,7 +42,7 @@ export class ProTable extends React.Component {
         if (props.defaultPageSize) {
             this.state.pageSize = props.defaultPageSize
         }
-        this.id = StrUtil.random(32)
+        this.id = StringUtils.random(32)
         this.showToolbarSearch = this.props.showToolbarSearch
     }
 
@@ -91,7 +91,8 @@ export class ProTable extends React.Component {
         })
     }
 
-// 数据重新加载后，更新toolbar需要的已选择数据行
+
+    // 数据重新加载后，更新toolbar需要的已选择数据行
     updateSelectedRows = list => {
         const {rowKey = "id"} = this.props
         const {selectedRows} = this.state
@@ -121,10 +122,7 @@ export class ProTable extends React.Component {
 
 
         return <div className={'tmgg-pro-table '} id={this.id}>
-
             {this.renderForm()}
-
-
                 {toolbarOptions !== false && <Toolbar
                     actionRef={actionRef}
                     toolBarRender={this.getToolBarRenderNode(toolBarRender)}

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

@@ -1,3 +1,2 @@
 .tmgg-pro-table{
-  padding: 16px;
 }

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

@@ -1,28 +1,17 @@
-import {
-    FieldDateTimePickerString,
-    FieldDictRadio,
-    FieldImageBase64,
-    FieldInput,
-    FieldPassword,
-    FieldRadioBoolean,
-    FieldSelect,
-    FieldUploadImage
-} from "../field";
-import {ViewBoolean, ViewImage, ViewPassword, ViewText} from "../view";
+
+import {ViewImage,  ViewText} from "../view";
+import {ViewPassword,ViewBoolean} from "../../view-components";
+import {FieldDictSelect, FieldRemoteSelect} from "../../field-components";
+import {Input} from "antd";
 
 
 export const fieldRegistry = {
-    'text':FieldInput,
+    'text':Input,
 
-    'dict':FieldDictRadio,
-    'dictRadio':FieldDictRadio,
-    'password':FieldPassword,
-    'datetime':FieldDateTimePickerString,
-    'boolean':FieldRadioBoolean,
-    imageBase64:FieldImageBase64,
-    image:FieldUploadImage,
+    'dict':FieldDictSelect,
+    'password':Input.Password,
 
-    select: FieldSelect
+    select: FieldRemoteSelect
 }
 
 export const viewRegistry = {

package/src/framework/components/{index.js → index.ts}

@@ -1,25 +1,17 @@
-export * from './field'
 export * from './ProModal'
 export * from './Ellipsis'
-export * from './ButtonList'
-export * from './HasPerm'
+
 export * from './system'
-export * from './ImageView';
 
 
 export * from './PageLoading'
-export * from './OrgTree'
+
 export * from './ProTable'
 export * from './DownloadFileButton'
 
 export * from './NamedIcon'
-export * from './EditTable'
 export * from './view'
 export * from './LinkButton'
 export * from './Gap'
-export * from  './Panel'
 export * from './Page'
-export  * from './Echarts'
-export * from './MsgBox'
 export * from './ValueType'
-export * from './RoleTree'

package/src/framework/components/system/ButtonList.jsx

@@ -0,0 +1,35 @@
+import React from 'react';
+import {Space} from 'antd';
+import {PermUtils} from "../../utils";
+
+
+/**
+ * 带权限的按钮列表
+ * @param maxNum: 显示子节点的个数， 超过的为收缩起来
+ *
+ */
+export class ButtonList extends React.Component {
+
+
+    render() {
+        let {children} = this.props;
+        const menus = [];
+
+        // 判断是否数组
+        if (Array.isArray(children)) {
+            for (let child of children) {
+                if (child === null || child === undefined) {
+                    continue;
+                }
+                if (child.props == null || child.props.perm == null || PermUtils.hasPermission(child.props.perm)) {
+                    menus.push(child);
+                }
+            }
+        } else {
+            menus.push(children)
+        }
+
+
+        return <Space>{menus}</Space>;
+    }
+}

package/src/framework/components/system/HasPerm.tsx

@@ -0,0 +1,14 @@
+import {ReactNode} from "react";
+import {PermUtils} from "../../utils";
+
+/**
+ * 使用该组件，可以判断权限
+ */
+export function HasPerm(props: { code: string, children: ReactNode }) {
+    let {code} = props;
+
+    if (PermUtils.hasPermission(code)) {
+        return props.children;
+    }
+
+}

package/src/framework/components/system/index.tsx

@@ -0,0 +1,29 @@
+import {FieldRemoteSelect, FieldRemoteSelectMultiple, FieldRemoteTreeSelect} from "../../field-components";
+import React from "react";
+
+export * from './ButtonList'
+export * from './HasPerm'
+
+export function FieldUserSelect(props) {
+    return <FieldRemoteSelect url="admin/sysUser/options" {...props} />;
+}
+export function FieldUserSelectMultiple(props) {
+    return <FieldRemoteSelectMultiple url="admin/sysUser/options" {...props} />;
+}
+
+export function FieldUnitTreeSelect(props) {
+    return <FieldRemoteTreeSelect url="admin/sysOrg/unitTree" {...props} />;
+}
+
+export function FieldDeptTreeSelect(props) {
+    return <FieldRemoteTreeSelect url="admin/sysOrg/deptTree" {...props} />;
+}
+
+export function FieldOrgTreeSelect(props) {
+    return <FieldRemoteTreeSelect url="admin/sysOrg/deptTree" {...props} />;
+}
+
+export function FieldOrgTreeMultipleSelect(props) {
+    return <FieldRemoteSelectMultiple url="/sysOrg/deptTree" {...props} />;
+}
+

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

@@ -0,0 +1,20 @@
+import React from 'react';
+import { Tag } from 'antd';
+
+// 定义组件的 Props 接口
+interface ViewBooleanEnableDisableProps {
+    value: boolean | null | undefined;
+}
+
+export class ViewBooleanEnableDisable extends React.Component<ViewBooleanEnableDisableProps, any> {
+
+    render() {
+        const { value } = this.props;
+
+        if (value == null) {
+            return null;
+        }
+
+        return value ? <Tag color={"green"}>启动</Tag> : <Tag color={"red"}>禁用</Tag>;
+    }
+}

package/src/framework/components/view/ViewEllipsis.jsx

@@ -1,6 +1,6 @@
 import React from 'react';
 import {Button, Modal, Popover} from 'antd';
-import {StrUtil} from "../../utils";
+import {StringUtils} from "../../utils";
 
 
 export class ViewEllipsis extends React.Component {
@@ -10,7 +10,7 @@ export class ViewEllipsis extends React.Component {
     render() {
         let {maxLength, value} = this.props;
 
-        const short = StrUtil.ellipsis(value, maxLength)
+        const short = StringUtils.ellipsis(value, maxLength)
         return  <Popover placement="topLeft" title={'长文本'} content={<Button onClick={this.showModal}>点击查看全部内容</Button>}>
             {short}
         </Popover>

package/src/framework/components/view/ViewFile.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import {Carousel, Empty} from 'antd';
-import {SysUtil} from "../../system";
 
 
 export class ViewFile extends React.Component {
@@ -15,7 +14,7 @@ export class ViewFile extends React.Component {
 
         let arr = fileId.split(',');
 
-        let urlList = arr.map(id => SysUtil.wrapServerUrl('admin/sysFile/preview/' + id));
+        let urlList = arr.map(id => 'admin/sysFile/preview/' + id);
         let height = this.props.height;
 
         if(urlList.length === 1){

package/src/framework/components/view/ViewImage.jsx

@@ -1,6 +1,5 @@
 import React from 'react';
 import {Modal} from 'antd';
-import {SysUtil} from "../../system";
 
 
 export class ViewImage extends React.Component {
@@ -26,11 +25,11 @@ export class ViewImage extends React.Component {
       }
 
       if (isId) {
-        urlList.push(SysUtil.getServerUrl() + 'sysFile/preview/' + v);
+        urlList.push( 'admin/sysFile/preview/' + v);
         continue;
       }
 
-      urlList.push(SysUtil.getServerUrl() + v);
+      urlList.push( v);
     }
 
     const imgs = urlList.map((url) => (

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

@@ -0,0 +1,16 @@
+import React from "react";
+import {Typography} from "antd";
+
+interface ViewTextProps {
+    value: string | null | undefined;
+}
+
+export class ViewText extends React.Component<ViewTextProps, any>{
+
+    render() {
+        if(this.props.value == null){
+            return null;
+        }
+        return <Typography.Text> {this.props.value}</Typography.Text>;
+    }
+}

package/src/framework/components/view/{index.js → index.ts}

@@ -3,10 +3,8 @@
  * 统一有个值叫value
  */
 export * from './ViewEllipsis'
-export * from './ViewBoolean'
 export * from './ViewBooleanEnableDisable'
 export * from './ViewImage'
 export * from './ViewRange'
 export * from  './ViewFile'
 export * from './ViewText'
-export * from './ViewPassword'

package/src/framework/field-components/FieldBoolean.d.ts

@@ -0,0 +1,13 @@
+import React from 'react';
+import { SelectProps } from 'antd/es/select';
+
+export interface FieldBooleanProps  {
+
+    type?:'select' | 'radio' | 'checkbox' |  'switch'; // 默认 select
+    value?: boolean;
+    onChange?: (value: boolean) => void;
+
+}
+
+export class FieldBoolean extends React.Component<FieldBooleanProps, any> {}
+