@jiangood/springboot-admin-starter 0.0.1 → 0.0.2

package/config/dist/config.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var umi_1 = require("umi");
+//https://umijs.org/docs/api/config
+console.log('i am config.ts');
+exports.default = (0, umi_1.defineConfig)({
+    // 配置是否让生成的文件包含 hash 后缀，通常用于增量发布和避免浏览器加载缓存。
+    hash: true,
+    history: { type: 'hash' },
+    // 复杂，还得设置忽略、编译等，先关掉
+    mfsu: false,
+});

package/config/dist/config.local.js

@@ -0,0 +1,23 @@
+"use strict";
+// .umirc.local.ts 仅在 umi dev 时有效。umi build 时不会被加载
+// 这份配置会和 .umirc.ts 做 deep merge 后形成最终配置。
+Object.defineProperty(exports, "__esModule", { value: true });
+var umi_1 = require("umi");
+exports.default = (0, umi_1.defineConfig)({
+    proxy: {
+        '/admin': {
+            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

@@ -0,0 +1,20 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+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

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var fs = require("fs");
+var path = require("path");
+// 自动注册src/forms下的表单
+var pkgName = '@jiangood/springboot-admin-starter';
+exports.default = (function (api) {
+    api.logger.info('plugin starting... ');
+    api.logger.info('info', JSON.stringify(api.env));
+    api.describe({
+        key: 'form-register-by-dir',
+    });
+    var isFramework = api.pkg.name === pkgName;
+    api.logger.info('current pkgName', api.pkg.name);
+    api.logger.info('is framework ?', isFramework);
+    var formRegistryPath = path.join(api.paths.absSrcPath, 'framework');
+    if (!isFramework) {
+        formRegistryPath = path.join(api.paths.absNodeModulesPath, pkgName);
+    }
+    api.logger.info('formRegistryPath', formRegistryPath);
+    api.addEntryImports(function () { return ({
+        source: formRegistryPath,
+        specifier: '{formRegistry}'
+    }); });
+    parseDir(api, path.join(api.paths.absSrcPath, 'forms'));
+    if (!isFramework) {
+        parseDir(api, path.join(api.paths.absNodeModulesPath, pkgName, 'src', 'forms'));
+    }
+});
+function parseDir(api, dir) {
+    api.logger.info('scan dir', dir);
+    if (!fs.existsSync(dir)) {
+        api.logger.info('dir not exist, return ');
+        return;
+    }
+    fs.readdirSync(dir).forEach(function (file) {
+        if (!file.endsWith(".jsx")) {
+            return;
+        }
+        var source = path.join(dir, file);
+        var name = file.replace(".jsx", "");
+        // import form
+        api.addEntryImports(function () { return ({
+            source: source,
+            specifier: name
+        }); });
+        // register form
+        api.addEntryCodeAhead(function () { return "formRegistry.register(\"".concat(name, "\",").concat(name, " );"); });
+        api.logger.info('formRegistry.register: ', name, source);
+    });
+}

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

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var fs = require("fs");
+var path = require("path");
+// 自动注册src/forms下的表单
+var pkgName = '@jiangood/springboot-admin-starter';
+exports.default = (function (api) {
+    api.describe({
+        key: 'addDependenceRoutes',
+    });
+    var pageDir = api.paths.absNodeModulesPath + "/" + pkgName + "/src/pages";
+    api.logger.info('scan dir is', pageDir);
+    var exist = fs.existsSync(pageDir);
+    if (!exist) {
+        api.logger.info('dir not exist, return ');
+        return;
+    }
+    var frameworkRoutes = [];
+    parseDir(pageDir, frameworkRoutes);
+    api.modifyRoutes(function (routes) {
+        // routes 代表用户项目的路由，umi已经自动解析过pages目录
+        // 接下来加入加入框架的路由，确保用户项目路由优先级高
+        for (var _i = 0, frameworkRoutes_1 = frameworkRoutes; _i < frameworkRoutes_1.length; _i++) {
+            var route = frameworkRoutes_1[_i];
+            if (routes[route.id] == null) { //  如果用户项目没有这个路由，则加入。否则以用户项目为准
+                routes[route.id] = route;
+            }
+        }
+        return routes;
+    });
+});
+function parseDir(pageDir, fileRoutes) {
+    var list = fs.readdirSync(pageDir);
+    for (var _i = 0, list_1 = list; _i < list_1.length; _i++) {
+        var fileName = list_1[_i];
+        var fullPath = path.join(pageDir, fileName);
+        var stats = fs.statSync(fullPath);
+        if (stats.isFile()) {
+            if (fileName.endsWith(".jsx")) {
+                addRoute(fullPath, fileRoutes);
+            }
+        }
+        else if (stats.isDirectory()) {
+            parseDir(fullPath, fileRoutes);
+        }
+    }
+}
+function addRoute(file, fileRoutes) {
+    var routePath = file.substring(file.indexOf('pages') + 6, file.length - 4);
+    routePath = routePath.replaceAll('\\', '/');
+    var parentId = "@@/global-layout";
+    // 文件$开头的会替换为路径变量 如$id 变为 :id
+    routePath = routePath.replaceAll("\$", ":");
+    fileRoutes.push({
+        absPath: file,
+        id: routePath,
+        path: routePath,
+        file: file,
+        parentId: parentId
+    });
+    if (routePath.endsWith("/index")) {
+        routePath = routePath.substring(0, routePath.length - 6);
+        fileRoutes.push({
+            absPath: file,
+            id: routePath,
+            path: routePath,
+            file: file,
+            parentId: parentId
+        });
+    }
+}

package/package.json

@@ -30,12 +30,12 @@
   "description": "springboot-admin-starter",
   "files": [
     "src/*",
-    "config/*"
+    "config/dist/*"
   ],
   "main": "src/index.js",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "scripts": {
     "dev": "umi dev",
-    "build": "umi build"
+    "build": "tsc --outDir config/dist --skipLibCheck --noEmitOnError false config/index.ts"
   }
 }

package/src/app.js

@@ -0,0 +1 @@
+console.log('i am app.js')

package/src/components/InstanceInfo.jsx

@@ -121,15 +121,12 @@ export default class InstanceInfo extends React.Component {
         let ExForm = formRegistry.get(formKey);
         if (!ExForm) {
             return <div>
+                <p>
                 未注册表单，请注册表单 {formKey}。
-                <Gap></Gap>
-                <div>js代码示例：</div>
-                <div>
-                    // app.js
-                </div>
-                <div>
-                    formRegistry.register("{formKey}",XXXForm)
-                </div>
+                </p>
+                <Typography.Text>
+                    表单路径：src/forms/{formKey}.jsx
+                </Typography.Text>
                 </div>
         }
 

package/src/forms/driverForm.jsx

@@ -0,0 +1,18 @@
+import {Form, Input} from "antd";
+
+
+export default function (props){
+console.log(props)
+
+    return <div>
+        demo-司机表单
+        <Form>
+            <Form.Item label="车牌号">
+                <Input/>
+            </Form.Item>
+            <Form.Item label="姓名">
+                <Input/>
+            </Form.Item>
+        </Form>
+    </div>
+}

package/src/framework/system/index.js

@@ -9,5 +9,5 @@ export * from './page'
 export  * from "./sys"
 
 export * from './http'
-export * from './FormRegistry'
+export * from './formRegistry'
 export * from './theme'

package/src/layouts/admin/index.jsx

@@ -108,7 +108,7 @@ export default class extends React.Component {
             <Header className='header'>
                 <div className='header-left'>
 
-                    <img className='logo-img' src={siteInfo.logoUrl} onClick={() => history.push('/')} alt='logo'/>
+                    {siteInfo.logoUrl &&   <img className='logo-img' src={siteInfo.logoUrl} onClick={() => history.push('/')} alt='logo'/>}
                     <h3 className='hide-on-mobile'>
                         <Link to="/" style={{color: theme["primary-color"]}}>{siteInfo.title} </Link>
                     </h3>

package/src/pages/flowable/task/form.jsx

@@ -2,7 +2,7 @@ import React from "react";
 import {Button, Card, Form, Input, message, Radio, Spin, Splitter,} from "antd";
 import InstanceInfo from "../../../components/InstanceInfo";
 import {history} from "umi";
-import {HttpUtil, Page} from "../../../framework";
+import {HttpUtil, Page, PageUtil} from "../../../framework";
 
 export default class extends React.Component {
 

package/src/pages/flowable/task/index.jsx

@@ -1,7 +1,7 @@
 import React from "react";
 import {Button, Modal, Tabs} from "antd";
-import {HttpUtil, LinkButton, Page, PageLoading, ProTable} from "../../../framework";
 import InstanceInfo from "../../../components/InstanceInfo";
+import {HttpUtil, LinkButton, Page, PageLoading, ProTable} from "../../../framework";
 
 
 export default class extends React.Component {

package/src/pages/test.jsx

@@ -10,7 +10,6 @@ export default class extends React.Component {
 
 
 
-
         </Card>
     }
 }

package/config/config.js

@@ -1,10 +0,0 @@
-import {defineConfig} from 'umi';
-import {defaultConfig} from "./defaultConfig";
-
-
-
-
-
-export default defineConfig({
-    ...defaultConfig,
-});

package/config/config.local.js

@@ -1,10 +0,0 @@
-// .umirc.local.ts 仅在 umi dev 时有效。umi build 时不会被加载
-// 这份配置会和 .umirc.ts 做 deep merge 后形成最终配置。
-
-
-import {defineConfig} from 'umi';
-import { defaultConfigLocal} from "./defaultConfig";
-
-
-
-export default defineConfig(defaultConfigLocal);

package/config/defaultConfig.js

@@ -1,35 +0,0 @@
-const defaultConfig = {
-    npmClient: 'pnpm',
-
-   // 配置是否让生成的文件包含 hash 后缀，通常用于增量发布和避免浏览器加载缓存。
-    hash: true,
-    history: {type: 'hash'},
-    // monorepo 复杂，还得设置忽略、编译等，先关掉
-    mfsu: false,
-};
-
-
-const defaultConfigLocal = {
-
-    proxy: {
-        '/admin': {
-            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,
-        },
-    }
-};
-
-
-module.exports = {
-    defaultConfig, defaultConfigLocal
-}

package/config/plugins/forms.js

@@ -1,44 +0,0 @@
-const IApi = require( 'umi').IApi;
-
-const fs = require("fs");
-const path = require("path");
-
-
-
-
-module.exports = (api) => {
-    api.describe({
-        key: 'registryForms',
-    });
-
-    const dir = api.cwd + "/src/forms"
-    const files = fs.readdirSync(dir)
-    api.register({
-        key: 'addEntryImports',
-        fn: ()=>{
-            return 'import { formRegistry } from "./framework/system/FormRegistry";'
-        }
-    })
-    api.addEntryImports(()=>{
-        return {
-            source: "./framework/system/FormRegistry",
-            specifier: 'formRegistry'
-        }
-    })
-
-    files.forEach(fileName=>{
-        const fullPath = path.join(dir, fileName)
-        const stats = fs.statSync(fullPath)
-        if (stats.isFile() && fileName.endsWith(".jsx")) {
-            api.register({
-                key: 'addEntryCode',
-                fn: () => {
-                    return 'formRegistry.register("' + fileName + '", ' + fileName.substring(0, fileName.length - 4) + ');
-                }
-            })
-        }
-    })
-
-
-};
-

package/config/plugins/routes.js

@@ -1,82 +0,0 @@
-const IApi = require( 'umi').IApi;
-
-const fs = require("fs");
-const path = require("path");
-
-// 扫描依赖模块的路由
-
-function addRoute(file, fileRoutes) {
-    let routePath = file.substring(file.indexOf('pages') + 6, file.length - 4)
-    routePath = routePath.replaceAll('\\', '/')
-
-    let parentId = "@@/global-layout";
-
-    // 文件$开头的会替换为路径变量 如$id 变为 :id
-    routePath = routePath.replaceAll("\$", ":")
-
-    fileRoutes.push({
-        absPath: file,
-        id: routePath,
-        path: routePath,
-        file,
-        parentId
-    })
-    if (routePath.endsWith("/index")) {
-        routePath = routePath.substring(0, routePath.length - 6)
-        fileRoutes.push({
-            absPath: file,
-            id: routePath,
-            path: routePath,
-            file,
-            parentId: parentId
-        })
-    }
-}
-
-
-
-module.exports = (api) => {
-    api.describe({
-        key: 'addDependenceRoutes',
-    });
-
-    const content = fs.readFileSync(api.cwd + "/package.json", "utf-8")
-    const pkg = JSON.parse(content)
-    const deps = Object.assign({}, pkg.devDependencies, pkg.dependencies, pkg.peerDependencies)
-    const pagePkg = [];
-    for (let k in deps) {
-        if (k.startsWith("@jiangood/springboot-admin-starter")) {
-            pagePkg.push(k)
-        }
-    }
-
-    const fileRoutes = []
-    for (let pkg of pagePkg) {
-        const pageDir = api.cwd + "/node_modules/" + pkg + "/src/pages"
-        parseDir(pageDir, fileRoutes)
-    }
-    api.modifyRoutes((routes) => {
-        for (let fileRoute of fileRoutes) {
-            if(routes[fileRoute.id] == null){
-                routes[fileRoute.id] = fileRoute
-            }
-        }
-        return routes;
-    })
-};
-function parseDir(pageDir, fileRoutes) {
-    const list = fs.readdirSync(pageDir)
-
-    for (let fileName of list) {
-        const fullPath = path.join(pageDir, fileName)
-        const stats = fs.statSync(fullPath)
-        if (stats.isFile()) {
-            if (fileName.endsWith(".jsx")) {
-                addRoute(fullPath, fileRoutes)
-            }
-        } else if (stats.isDirectory()) {
-            parseDir(fullPath, fileRoutes)
-        }
-
-    }
-}