@jiangood/admin-spring-boot-starter 0.3.3 → 0.3.5

package/config/dist/common-plugin.js

@@ -0,0 +1,148 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var fs = require("fs");
+var path = require("path");
+var pkgName = '@jiangood/admin-spring-boot-starter';
+exports.default = (function (api) {
+    api.describe({
+        key: 'admin-spring-boot-stater',
+    });
+    api.logger.info('plugin starting... ');
+    var isFramework = api.pkg.name === pkgName;
+    var frameworkDirs = Utils.getDirs(api.paths.absNodeModulesPath + "/@jiangood");
+    api.logger.info('依赖的框架：', frameworkDirs);
+    var _loop_1 = function (frameworkDir) {
+        api.logger.info("正在解析文件夹", frameworkDir);
+        // 处理路由
+        var routeFiles = Utils.findFilesSync(frameworkDir, /src\/pages\/.*\.jsx$/); // src/pages/**
+        api.logger.info("找到的页面文件：", routeFiles);
+        api.modifyRoutes(function (routes) {
+            for (var _i = 0, routeFiles_1 = routeFiles; _i < routeFiles_1.length; _i++) {
+                var file = routeFiles_1[_i];
+                var route = convertFileToRoute(file);
+                if (route) {
+                    if (routes[route.id] == null) { //  如果用户项目没有这个路由，则加入。否则以用户项目为准
+                        api.logger.info("加入路由:", route.id, "路径:", route.absPath);
+                        routes[route.id] = route;
+                    }
+                }
+            }
+            api.logger.info("路由修改完成");
+            return routes;
+        });
+    };
+    // ==================== 处理路由 ========================
+    for (var _i = 0, frameworkDirs_1 = frameworkDirs; _i < frameworkDirs_1.length; _i++) {
+        var frameworkDir = frameworkDirs_1[_i];
+        _loop_1(frameworkDir);
+    }
+    // =============== 处理表单 ========================
+    { // 导入工具类 FormRegistryUtils
+        var importFrom_1 = path.join(api.paths.absSrcPath, 'framework');
+        if (!isFramework) {
+            importFrom_1 = path.join(api.paths.absNodeModulesPath, pkgName);
+        }
+        api.logger.info('formRegistryPath', importFrom_1);
+        api.addEntryImports(function () { return ({
+            source: importFrom_1,
+            specifier: '{FormRegistryUtils}'
+        }); });
+    }
+    Utils.findFilesSync(api.paths.absSrcPath, /forms\/.*\.jsx$/).forEach(function (file) {
+        var name = Utils.getFileMainName(file);
+        api.addEntryImports(function () { return ({
+            source: file,
+            specifier: name
+        }); });
+        // register form
+        api.addEntryCodeAhead(function () { return "FormRegistryUtils.register(\"".concat(name, "\",").concat(name, " );"); });
+        api.logger.info('新版本 formRegistry.register: ', name, file);
+    });
+});
+function convertFileToRoute(file) {
+    var absPath = file;
+    var mainName = Utils.getFileMainName(file);
+    // 只添加小写开头的文件页面，大写的默认为组件
+    if (mainName.charAt(0) !== mainName.charAt(0).toLowerCase()) {
+        return;
+    }
+    var routePath = file.substring(file.indexOf('pages') + 6, file.length - 4);
+    routePath = routePath.replaceAll("\$", ":"); // 文件$开头的会替换为路径变量 如$id 变为 :id
+    var parentId = "@@/global-layout";
+    if (routePath.endsWith("/index")) {
+        routePath = routePath.substring(0, routePath.length - 6);
+    }
+    return {
+        absPath: absPath,
+        id: routePath,
+        path: routePath,
+        file: file,
+        parentId: parentId
+    };
+}
+var Utils = /** @class */ (function () {
+    function Utils() {
+    }
+    /**
+     * 获取目录下的所有子目录
+     * @param dir
+     * @returns {string[]}  完整路径
+     */
+    Utils.getDirs = function (dir) {
+        console.log('获取dir....', dir);
+        if (!fs.existsSync(dir))
+            throw new Error("\u76EE\u5F55\u4E0D\u5B58\u5728: ".concat(dir));
+        return fs.readdirSync(dir).map(function (item) {
+            var fullPath = path.join(dir, item);
+            if (fs.statSync(fullPath).isDirectory()) {
+                return path.join(dir, item);
+            }
+        });
+    };
+    /**
+     * 同步获取目录下所有文件
+     */
+    Utils.getAllFilesSync = function (dir) {
+        if (!fs.existsSync(dir))
+            throw new Error("\u76EE\u5F55\u4E0D\u5B58\u5728: ".concat(dir));
+        var results = [];
+        function traverse(currentDir) {
+            fs.readdirSync(currentDir).forEach(function (item) {
+                var fullPath = path.join(currentDir, item);
+                if (fs.statSync(fullPath).isDirectory()) {
+                    traverse(fullPath);
+                }
+                else {
+                    results.push(fullPath.split(path.sep).join('/'));
+                }
+            });
+        }
+        traverse(dir);
+        return results;
+    };
+    /**
+     * 同步查找匹配模式的文件
+     *
+     * @return 文件列表 全路径
+     */
+    Utils.findFilesSync = function (dir, pattern) {
+        var files = this.getAllFilesSync(dir);
+        return files.filter(function (file) { return pattern.test(file); }).map(function (file) { return file.split(path.sep).join('/'); });
+    };
+    /**
+     * 获取文件名（不含后缀）
+     * @param {string} filePath - 文件路径
+     * @returns {string} 文件名（不含后缀）
+     */
+    Utils.getFileMainName = function (filePath) {
+        // 从路径中提取文件名
+        var fileName = path.basename(filePath);
+        // 移除扩展名
+        var lastDotIndex = fileName.lastIndexOf('.');
+        if (lastDotIndex > 0) {
+            return fileName.substring(0, lastDotIndex);
+        }
+        return fileName; // 没有扩展名的情况
+    };
+    return Utils;
+}());

package/config/dist/config.js

@@ -7,9 +7,9 @@ var path = require("path");
 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'));
+var isFramework = fs.existsSync(path.join(process.cwd(), 'config/common-plugin.ts'));
 console.log('isFramework', isFramework);
-var pluginDir = isFramework ? './config/plugins' : '@jiangood/admin-spring-boot-starter/config/dist/plugins';
+var pluginDir = isFramework ? './config' : '@jiangood/admin-spring-boot-starter/config/dist';
 console.log('pluginDir', pluginDir);
 var host = '127.0.0.1:8080';
 exports.default = (0, umi_1.defineConfig)({
@@ -20,8 +20,7 @@ exports.default = (0, umi_1.defineConfig)({
     mfsu: false,
     esbuildMinifyIIFE: true,
     plugins: [
-        pluginDir + '/form-plugin',
-        pluginDir + '/route-plugin',
+        pluginDir + '/common-plugin',
     ],
     proxy: {
         '/admin': {

package/config/dist/index.js

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

package/package.json

@@ -4,7 +4,8 @@
     "@types/react-dom": "^19.0.0",
     "@types/react-lazylog": "^4.5.1",
     "@umijs/plugins": "^4.3.17",
-    "typescript": "^5.0.0"
+    "typescript": "^5.0.0",
+    "@jiangood/admin-process-plugin-spring-boot-starter": "1.0.6"
   },
   "peerDependencies": {
     "@ant-design/icons": "^6.0.0",
@@ -33,7 +34,7 @@
     "!src/.umi"
   ],
   "main": "src/index.ts",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "scripts": {
     "dev": "umi dev",
     "build": "tsc --outDir config/dist --skipLibCheck --noEmitOnError false config/index.ts"

package/src/framework/field-components/FieldRemoteTreeSelectMultiple.jsx

@@ -7,6 +7,10 @@ export class FieldRemoteTreeSelectMultiple extends React.Component {
 
     static defaultProps = {
         treeDefaultExpandAll: true,
+        style: {
+            width: '100%',
+            minWidth: 200,
+        },
     }
 
     state = {
@@ -44,10 +48,9 @@ export class FieldRemoteTreeSelectMultiple extends React.Component {
 
 
 
-
         return (
             <TreeSelect
-                style={{width: '100%', minWidth: 200}}
+                style={this.props.style}
                 allowClear={true}
                 dropdownStyle={{maxHeight: 400, overflow: 'auto'}}
                 treeData={data}
@@ -62,6 +65,7 @@ export class FieldRemoteTreeSelectMultiple extends React.Component {
                 }}
                 treeLine={{showLeafIcon: true}}
                 treeDefaultExpandAll={this.props.treeDefaultExpandAll}
+
             />
         );
     }

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

@@ -1,51 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var fs = require("fs");
-var path = require("path");
-// 自动注册src/forms下的表单
-var pkgName = '@jiangood/admin-spring-boot-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: '{FormRegistryUtils}'
-    }); });
-    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 "FormRegistryUtils.register(\"".concat(name, "\",").concat(name, " );"); });
-        api.logger.info('formRegistry.register: ', name, source);
-    });
-}

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

@@ -1,72 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var fs = require("fs");
-var path = require("path");
-// 自动注册src/forms下的表单
-var pkgName = '@jiangood/admin-spring-boot-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.logger.info('框架路由数量： ', frameworkRoutes.length);
-    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('\\', '/');
-    // 文件$开头的会替换为路径变量 如$id 变为 :id
-    routePath = routePath.replaceAll("\$", ":");
-    var parentId = "@@/global-layout";
-    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/src/pages/flowable/design/contextPad.js

@@ -1,50 +0,0 @@
-class CustomContextPad {
-  constructor(config, contextPad, create, elementFactory, injector, translate) {
-    this.create = create;
-    this.elementFactory = elementFactory;
-    this.translate = translate;
-
-    if (config.autoPlace !== false) {
-      this.autoPlace = injector.get('autoPlace', false);
-    }
-
-    contextPad.registerProvider(this);
-  }
-
-  static $inject = ['config', 'contextPad', 'create', 'elementFactory', 'injector'];
-
-  getContextPadEntries(element) {
-    const { autoPlace, create, elementFactory } = this;
-
-    function appendServiceTask(event, element) {
-      if (autoPlace) {
-        const shape = elementFactory.createShape({ type: 'bpmn:UserTask' });
-        autoPlace.append(element, shape);
-      } else {
-        appendServiceTaskStart(event, element);
-      }
-    }
-
-    function appendServiceTaskStart(event) {
-      const shape = elementFactory.createShape({ type: 'bpmn:UserTask' });
-      create.start(event, shape, element);
-    }
-
-    return {
-      'append.append-task': {
-        group: 'model',
-        className: 'bpmn-icon-user-task',
-        title: '追加用户任务',
-        action: {
-          click: appendServiceTask,
-          dragstart: appendServiceTaskStart,
-        },
-      },
-    };
-  }
-}
-
-export default {
-  __init__: ['customContextPad'],
-  customContextPad: ['type', CustomContextPad],
-};

package/src/pages/flowable/design/customTranslate/customTranslate.js

@@ -1,16 +0,0 @@
-// i18n demo https://github.com/bpmn-io/bpmn-js-examples/blob/main/i18n/src/customTranslate/customTranslate.js
-
-import translations1 from './translations';
-import translations2 from './translations-properties-panel';
-
-export default function customTranslate(template, replacements) {
-  replacements = replacements || {};
-
-  // Translate
-  template = translations1[template] || translations2[template] || template;
-
-  // Replace
-  return template.replace(/{([^}]+)}/g, function(_, key) {
-    return replacements[key] || '{' + key + '}';
-  });
-}

package/src/pages/flowable/design/customTranslate/translations-properties-panel.js

@@ -1,10 +0,0 @@
-
-export default {
-  "General": "通用",
-  "Documentation":"文档/描述",
-  "Element documentation":"元素的文本描述或注释",
-  "Service Task":"服务任务",
-  "Multi-instance":"多实例",
-  "Loop cardinality":"循环基数",
-  "Completion condition":"完成条件",
-};

package/src/pages/flowable/design/customTranslate/translations.js

@@ -1,144 +0,0 @@
-/**
- * This is a sample file that should be replaced with the actual translation.
- *
- * Checkout https://github.com/bpmn-io/bpmn-js-i18n for a list of available
- *
- * translations and labels to translate.
- *
- * demo: https://github.com/bpmn-io/bpmn-js-examples/
- */
-export default {
-  "Activate create/remove space tool": "启动创建/删除空间工具",
-  "Activate global connect tool": "启动全局连接工具",
-  "Activate hand tool": "启动手动工具",
-  "Activate lasso tool": "启动 Lasso 工具",
-  "Ad-hoc": "Ad-hoc子流程",
-  "Ad-hoc sub-process (collapsed)": "临时子流程（折叠）",
-  "Ad-hoc sub-process (expanded)": "临时子流程（展开）",
-  "Add lane above": "在上方添加通道",
-  "Add lane below": "在下方添加通道",
-  "Add text annotation": "添加文本注释",
-  "Append compensation activity": "追加补偿活动",
-  "Append conditional intermediate catch event": "添加中间条件捕获事件",
-  "Append end event": "添加结束事件",
-  "Append gateway": "添加网关",
-  "Append intermediate/boundary event": "添加中间/边界事件",
-  "Append message intermediate catch event": "添加消息中间捕获事件",
-  "Append receive task": "添加接收任务",
-  "Append signal intermediate catch event": "添加信号中间捕获事件",
-  "Append task": "添加任务",
-  "Append timer intermediate catch event": "添加定时器中间捕获事件",
-  "Business rule task": "规则任务",
-  "Call activity": "引用流程",
-  "Cancel boundary event": "取消边界事件",
-  "Cancel end event": "取消结束事件",
-  "Change type": "更改类型",
-  "Collection": "集合",
-  "Compensation boundary event": "补偿边界事件",
-  "Compensation end event": "结束补偿事件",
-  "Compensation intermediate throw event": "中间补偿抛出事件",
-  "Compensation start event": "补偿启动事件",
-  "Complex gateway": "复杂网关",
-  "Conditional boundary event": "条件边界事件",
-  "Conditional boundary event (non-interrupting)": "条件边界事件 (非中断)",
-  "Conditional flow": "条件流",
-  "Conditional intermediate catch event": "中间条件捕获事件",
-  "Conditional start event": "条件启动事件",
-  "Conditional start event (non-interrupting)": "条件启动事件 (非中断)",
-  "Connect to other element": "连接到其他元素",
-  "Connect using association": "文本关联",
-  "Connect using data input association": "数据关联",
-  "Connect using sequence/message flow or association": "消息关联",
-  "Create data object reference": "创建数据对象引用",
-  "Create data store reference": "创建数据存储引用",
-  "Create end event": "创建结束事件",
-  "Create expanded sub-process": "创建可折叠子流程",
-  "Create gateway": "创建网关",
-  "Create group": "创建组",
-  "Create intermediate/boundary event": "创建中间/边界事件",
-  "Create pool/participant": "创建池/参与者",
-  "Create start event": "创建开始事件",
-  "Create task": "创建任务",
-  "Data object reference": "数据对象引用",
-  "Data store reference": "数据存储引用",
-  "Default flow": "默认流",
-  "Delete": "删除",
-  "Divide into three lanes": "分成三条通道",
-  "Divide into two lanes": "分成两条通道",
-  "Empty pool/participant": "空泳道",
-  "Empty pool/participant (removes content)": "清空泳道（删除内容）",
-  "End event": "结束事件",
-  "Error boundary event": "错误边界事件",
-  "Error end event": "结束错误事件",
-  "Error start event": "错误启动事件",
-  "Escalation boundary event": "升级边界事件",
-  "Escalation boundary event (non-interrupting)": "升级边界事件 (非中断)",
-  "Escalation end event": "结束升级事件",
-  "Escalation intermediate throw event": "中间升级抛出事件",
-  "Escalation start event": "升级启动事件",
-  "Escalation start event (non-interrupting)": "升级启动事件 (非中断)",
-  "Event sub-process": "事件子流程",
-  "Event-based gateway": "事件网关",
-  "Exclusive gateway": "独占网关",
-  "Inclusive gateway": "包容网关",
-  "Intermediate throw event": "中间抛出事件",
-  "Link intermediate catch event": "中间链接捕获事件",
-  "Link intermediate throw event": "中间链接抛出事件",
-  "Loop": "循环",
-  "Manual task": "手动任务",
-  "Message boundary event": "消息边界事件",
-  "Message boundary event (non-interrupting)": "消息边界事件 (非中断)",
-  "Message end event": "结束消息事件",
-  "Message intermediate catch event": "中间消息捕获事件",
-  "Message intermediate throw event": "中间消息抛出事件",
-  "Message start event": "消息启动事件",
-  "Message start event (non-interrupting)": "消息启动事件 (非中断)",
-  "Open {element}": "打开 {element}",
-  "Parallel gateway": "并行网关",
-  "Parallel multi-instance": "并行多实例",
-  "Participant multiplicity": "参与者多重性",
-  "Receive task": "接受任务",
-  "Remove": "移除",
-  "Script task": "脚本任务",
-  "Search in diagram": "在图表中搜索",
-  "Send task": "发送任务",
-  "Sequence flow": "顺序流",
-  "Sequential multi-instance": "串行多实例",
-  "Service task": "服务任务",
-  "Signal boundary event": "信号边界事件",
-  "Signal boundary event (non-interrupting)": "信号边界事件 (非中断)",
-  "Signal end event": "结束信号事件",
-  "Signal intermediate catch event": "中间信号捕获事件",
-  "Signal intermediate throw event": "中间信号抛出事件",
-  "Signal start event": "信号启动事件",
-  "Signal start event (non-interrupting)": "信号启动事件 (非中断)",
-  "Start event": "开始事件",
-  "Sub-process": "子流程",
-  "Sub-process (collapsed)": "可折叠子流程",
-  "Sub-process (expanded)": "可展开子流程",
-  "Task": "任务",
-  "Terminate end event": "终止边界事件",
-  "Timer boundary event": "定时边界事件",
-  "Timer boundary event (non-interrupting)": "定时边界事件 (非中断)",
-  "Timer intermediate catch event": "中间定时捕获事件",
-  "Timer start event": "定时启动事件",
-  "Timer start event (non-interrupting)": "定时启动事件 (非中断)",
-  "Transaction": "事务",
-  "User task": "用户任务",
-  "already rendered {element}": "{element} 已呈现",
-  "correcting missing bpmnElement on {plane} to {rootElement}": "在 {plane} 上更正缺失的 bpmnElement 为 {rootElement}",
-  "diagram not part of bpmn:Definitions": "图表不是 bpmn:Definitions 的一部分",
-  "element required": "需要元素",
-  "element {element} referenced by {referenced}#{property} not yet drawn": "元素 {element} 的引用 {referenced}#{property} 尚未绘制",
-  "failed to import {element}": "{element} 导入失败",
-  "flow elements must be children of pools/participants": "元素必须是池/参与者的子级",
-  "missing {semantic}#attachedToRef": "在 {element} 中缺少 {semantic}#attachedToRef",
-  "more than {count} child lanes": "超过 {count} 条通道",
-  "multiple DI elements defined for {element}": "为 {element} 定义了多个 DI 元素",
-  "no bpmnElement referenced in {element}": "{element} 中没有引用 bpmnElement",
-  "no diagram to display": "没有要显示的图表",
-  "no parent for {element} in {parent}": "在 {element} 中没有父元素 {parent}",
-  "no process or collaboration to display": "没有可显示的流程或协作",
-  "no shape type specified": "未指定形状类型",
-  "out of bounds release": "越界释放"
-};