crabatool 1.0.414 → 1.0.415

package/apis/data.js

@@ -162,7 +162,8 @@ class data {
   }
 
   async reverseData(req, pageName, body) {
-    var oldEntity = await this._getDb(req).get(body.name, body.data.id);
+    var db = this._getDb(req);
+    var oldEntity = await db.get(body.name, body.data.id);
     if (!oldEntity) {
       crabatool.utils.end(res, {
         code: 404,
@@ -170,6 +171,8 @@ class data {
       });
       return;
     }
+    
+    await this.fillData(body.name, [oldEntity], db, true);
     //退回联动老数据
     var rt = await this.pageSaveToDataLinkage(req, body.name, pageName, oldEntity, null, true);
     return {
@@ -297,7 +300,7 @@ class data {
           //从原始数据中获取对应字段的数据
           var targetRef = _this.findFormateItem(item.filter.refField)
           var targetRefField = _this.findFormateItem(`#[${item.ref}.${item.field}]`)
-          var targetValue = _this.findItemMapData(name, crabatool.stringUtils.getFullPinyinCode(item.ref), data, new Set([...targetRef, ...targetRefField]));
+          var targetValue = _this.findItemMapData(name, crabatool.stringUtils.getFullPinyinCode(item.ref), data, new Set([...targetRef, ...targetRefField, `${item.ref}.id`]));
           var refFieldName = this.matchFields(item.filter.refField)[0];
           var refFieldNamePy = crabatool.stringUtils.getFullPinyinCode(refFieldName);
           var targetArray = refFieldNamePy.split('.')
@@ -325,7 +328,13 @@ class data {
                 //传入了老数据，当前计算的值可以直接取老数据的对应值，因为它已经排除本单
                 var oldDataTemp = oldData[name][refNamePy];
                 if (oldDataTemp instanceof Array) {
-                  target[refNamePy][fieldNamePy] = oldDataTemp[0][fieldNamePy];//强制取第一行
+                  target[refNamePy][fieldNamePy] = 0;
+                  for(var m = 0 ; m < oldDataTemp.length; m++){
+                    if(oldDataTemp[m].id == target[refNamePy].id){
+                      target[refNamePy][fieldNamePy] = oldDataTemp[m][fieldNamePy];
+                      break;
+                    }
+                  }
                 } else {
                   target[refNamePy][fieldNamePy] = oldDataTemp[fieldNamePy] ? oldDataTemp[fieldNamePy] : 0;
                 }

package/lib/jsoncrud.js

@@ -127,7 +127,7 @@ class JSONCRUD {
     const end = start + pageSize
 
     return {
-      data: sorted.slice(start, end),
+      data: JSON.parse(JSON.stringify(sorted.slice(start, end))),
       pageData: {
         count: allData.length,
         page,
@@ -158,7 +158,7 @@ class JSONCRUD {
 
     const index = this.entities[entityName].data.findIndex(item => item.id === id)
     if (index === -1) return null
-    return this.entities[entityName].data[index]
+    return JSON.parse(JSON.stringify(this.entities[entityName].data[index]))
   }
 
   async getByField(entityName, field, value) {
@@ -167,7 +167,7 @@ class JSONCRUD {
 
     const index = this.entities[entityName].data.findIndex(item => item[field] === value)
     if (index === -1) return null
-    return this.entities[entityName].data[index]
+    return JSON.parse(JSON.stringify(this.entities[entityName].data[index]))
   }
 
   async update(entityName, id, updates) {
@@ -183,7 +183,7 @@ class JSONCRUD {
       updatedAt: new Date().toISOString()
     }
     await this.persist(entityName)
-    return this.entities[entityName].data[index]
+    return JSON.parse(JSON.stringify(this.entities[entityName].data[index]))
   }
 
   async batchUpdate(entityName, items) {

package/lib/server.js

@@ -92,6 +92,11 @@ function createServer(app, options) {
     app.use(utils.rewriteCrabaJs);
   }
 
+  // 统一拦截login.html
+  if (config.modName && !config.localLogin) {
+    app.use(utils.rewriteLoginHTML);
+  }
+
   // 指定静态文件目录
   var webPath = config.webPath;
   if (options) {
@@ -111,7 +116,7 @@ function createServer(app, options) {
         res.setHeader('Content-Type', 'text/html; charset=utf-8'); // 当做文本输出，才能显示到iframe中
       }
       var name = path.basename(pathname);
-      if (name == 'index.html') {
+      if (name == 'index.html' || name == 'login.html') {
         res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
         res.setHeader('Pragma', 'no-cache');
         res.setHeader('Expires', '0');

package/lib/utils.js

@@ -527,6 +527,43 @@ class Utils {
         res.end(content);
     }
 
+
+    rewriteLoginHTML(req, res, next) {
+        var url = req.originalUrl;
+        if (url.startsWith('/login.html')) {
+            var htmlPath = utils.join(__dirname, '../res/login.html');
+            var content = fs.readFileSync(htmlPath).toString();
+            content = content.replaceAll('${modName}', config.modName);
+
+            res.setHeader('Content-Type', 'text/html; charset=utf-8'); // 当做文本输出，才能显示到iframe中
+            res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
+            res.setHeader('Pragma', 'no-cache');
+            res.setHeader('Expires', '0');
+            res.end(content);
+        } else if (url.startsWith('/crabatool/Login.gspx')) {
+            var htmlPath = utils.join(__dirname, '../res/Login.gspx');
+            var content = fs.readFileSync(htmlPath).toString();
+            content = content.replaceAll('${modName}', config.modName);
+
+            res.setHeader('Content-Type', 'text/plain; charset=utf-8'); // 当做文本输出，才能显示到iframe中
+            res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
+            res.setHeader('Pragma', 'no-cache');
+            res.setHeader('Expires', '0');
+            res.end(content);
+        } else if (url.startsWith('/crabatool/Login.js')) {
+            var htmlPath = utils.join(__dirname, '../res/Login.js');
+            var content = fs.readFileSync(htmlPath).toString();
+            content = content.replaceAll('${modName}', config.modName);
+
+            res.setHeader('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate');
+            res.setHeader('Pragma', 'no-cache');
+            res.setHeader('Expires', '0');
+            res.end(content);
+        } else {
+            next();
+        }
+    }
+
     getFiles(options, fileList) {
         var exts = options.exts;
         var source = options.source;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.414",
+  "version": "1.0.415",
   "description": "crabatool",
   "main": "index.js",
   "bin": {
@@ -28,7 +28,10 @@
     "makeHash2": "node run.js -makeHash -webPath ./test/ -modName craba -files ./test/  -exts .js -outJson ./hash2.json -hashName sha384",
     "pageHash": "node run.js -pageHash /Test/TestMasterDetail.gspx",
     "addVersion": "node run.js -addVersion -file F:\\basicweb\\www\\index.html -exp AUTOVERSION",
-    "gspxHash": "node run.js -gspxHash -webPath F:\\Beefun\\srcs\\Beefun"
+    "gspxHash": "node run.js -gspxHash -webPath F:\\Beefun\\srcs\\Beefun",
+    "runShell": "node run.js -run -webPath F:\\shell-gerrit\\web\\src\\main\\resources\\static\\shell\\ -port 10000 -modName shell",
+    "runShellLocal": "node run.js -run -webPath F:\\shell-gerrit\\web\\src\\main\\resources\\static\\shell\\ -port 10000 -modName shell -localLogin true",
+    "runJxc": "node run.js -run -webPath F:\\jxc\\jxc-web\\src\\main\\resources\\static\\jxc\\ -port 10001 -modName jxc"
   },
   "author": "wssf",
   "dependencies": {

package/res/Login.gspx

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Page xmlns="Craba.UI" Title="NGP开发环境统一登录入口" ActionType="crabatool.LoginAction, crabatool/Login.js" DataSource='${formData}'>
+    <FlexColumn CssClass='FlexCenter MainBg'>
+        <FlowPanel Caption='Ngp模块登录' CssClass='VertItem' LayoutDirection='Vert' ItemLabelWidth='70' ItemCssClass='FlexAuto'>
+            <TextEdit Label='公司名称:' DataField='companyName' Required="true" />
+            <TextEdit Label='职员名称:' DataField='employeeName' Required="true" />
+            <DropDownEdit Label='指定产品:' DataField='productId' DataSource='${formData.products}' DataTextField='name' DataValueField='id' Required="true" OnChange="doChangeProduct" />
+            <HBlock Label='服务版本:'>
+                <TextEdit DataField='deploy' CssClass='FlexAuto' NullDisplayText='不填写则使用默认账套账本' />
+                <DropDownEdit DataField='productDeploy' DataSource="${formData.productDeploys}" DataTextField='deployName' DataValueField='deployName' />
+            </HBlock>
+            <TextEdit Label='本地端口:' DataField='localPort' Required="true" />
+
+            <Grid ID='grid' DataField="routes" AutoMaxRowCount="8" AllowConfig='false' ReadOnly='false'>
+                <TextColumn Caption="模块名称" DataField="serverName" AllowStretch='true' NullDisplayText='微服务名称' />
+                <TextColumn Caption="Ip" DataField="serverIp" AllowStretch='true' NullDisplayText='微服务IP地址' />
+                <TextColumn Caption="端口" DataField="serverPort" AllowStretch='true' NullDisplayText='微服务端口号' />
+                <RowDeleteColumn Caption="操作" />
+            </Grid>
+
+            <FlexBlock CssClass='BottomBlock FlexRight'>
+                <Button Text='添加路由' OnClick='addRoute' />
+                <Button Text='登录' CssClass='SpecialButton' OnClick="doLogin" />
+            </FlexBlock>
+        </FlowPanel>
+    </FlexColumn>
+
+    <Style>
+        .MainBg{background-color: #374979;}
+        .MainBg .FlowPanel{border-radius:8px;box-shadow:0 0 18px #111;width:600px;}
+        .MainBg .FlowPanel .FlowItem{padding:10px 20px;margin:0;}
+        .MainBg .GridBlock{margin:10px 20px}
+    </Style>
+</Page>

package/res/Login.js

@@ -0,0 +1,155 @@
+Type.registerNamespace('crabatool');
+crabatool.LoginAction = function() {
+    crabatool.LoginAction.initializeBase(this);
+};
+
+crabatool.LoginAction.prototype = {
+    context: function(cb) {
+        this.initData(cb);
+    },
+
+    initialize: function LoginAction$initialize() {
+        crabatool.LoginAction.callBaseMethod(this, 'initialize');
+    },
+
+    initData: function(cb) {
+        var data = {
+            companyName: "",
+            employeeName: "",
+            productId: "0",
+            deploy: "",
+            localPort: "",
+            routes: [],
+            products: [],
+            deploys: {},
+            productDeploys: [],
+            productDeploy: ""
+        };
+        var formData = { formData: data }; // 窗体数据
+
+        var routes = localStorage.getItem("routes");
+        if (routes) {
+            routes = JSON.parse(routes);
+            data.routes = routes;
+        }
+
+        var user = localStorage.getItem("user");
+        if (user) {
+            user = JSON.parse(user);
+            data.companyName = user.companyName;
+            data.employeeName = user.employeeName;
+            data.productId = user.productId;
+            data.deploy = user.deploy;
+            data.localPort = user.port || user.localPort || "";
+            data.productDeploy = user.productDeploy || "";
+        }
+
+        var route = localStorage.getItem("route");
+        if (route) {
+            route = JSON.parse(route);
+            this.setRoute(route, data);
+            this.login();
+            this.end(); // 不继续处理Login.gspx
+            return;
+        }
+
+        var that = this;
+        $common.ajax({
+            url: 'http://172.17.0.237:56789/ngp/auth/init',
+            type: 'GET',
+            success: function(res) {
+                if (res.code != "200") {
+                    $common.alertError("初始化信息失败");
+                    that.end();
+                    return;
+                }
+
+                data.deploys = res.data.deploys;
+                data.products = res.data.products;
+                console.log(data.productId);
+                data.productDeploys = res.data.deploys[data.productId];
+                cb(formData);
+            },
+            error: function() {
+                $common.alertError("网络请求失败");
+                that.end();
+            }
+        });
+    },
+
+    dispose: function() {
+        crabatool.LoginAction.callBaseMethod(this, 'dispose');
+    },
+
+    setRoute: function(route, data) {
+        route.deploy = data.deploy || (data.productDeploy || route.deploy);
+        route.productId = (data.productId == "0") ? route.productId : data.productId;
+        var debugMs = {};
+        for (var key in route) {
+            debugMs[key] = route[key];
+        }
+        debugMs.aloneDeploy = '${modName}';
+        debugMs.gateway = "http://eshop.gateway.ngp.wsgjp.com.cn";
+        debugMs.aloneServer = "http://" + location.hostname + ":" + data.localPort;
+        $ms.router = {//设置请求路由
+            debugMs: debugMs,
+            'ngp-authorization': 'jwt',
+            'ngp-router': 'ngprt'
+        };
+        if (data.routes.length > 0) {
+            var server = {};
+            for (var i = 0; i < data.routes.length; i++) {
+                var r = data.routes[i];
+                server[r.serverName] = r.serverIp + ":" + r.serverPort;
+            }
+            $ms.server = server;
+        }
+        var cookieStr = JSON.stringify(route);
+        $common.setCookieNoEscape("ngp-route", cookieStr);
+        localStorage.setItem("route", JSON.stringify(route));
+    },
+    login: function() {
+        $common.setCookieNoEscape('ngp-authorization', 'jwt');
+        $common.setCookieNoEscape('ngp-router', 'ngprt');
+        $common.setCookie('debugMs', JSON.stringify($ms.router.debugMs));
+
+        location.reload();
+    },
+    doLogin: function(sender) {
+        var user = this.get_form().saveData({clear:true});
+        var data = {
+            companyName: user.companyName,
+            userName: user.employeeName
+        };
+        localStorage.setItem("user", JSON.stringify(user));
+        localStorage.setItem("routes", JSON.stringify(user.routes));
+
+        var that = this;
+        $common.ajax({
+            url: "http://172.17.0.237:56789/ngp/auth/login",
+            data: data,
+            success: function(res) {
+                if (res.code != "200") {
+                    $common.alertError("登录失败，请检查公司名称和职员名称是否正确");
+                } else {
+                    that.setRoute(res.data, user);
+                    that.login();
+                }
+            },
+            error: function() {
+                $common.alertError("网络请求失败");
+            }
+
+        });
+    },
+    addRoute: function(sender) {
+        this.get_form().grid.appendRowData({});
+    },
+    doChangeProduct: function(sender) {
+        var pid = sender.get_value();
+        var deploys = this.get_context('formData').deploys;
+        var pdeploys = deploys[pid];
+        sender.get_form().productDeploy.set_items(pdeploys);
+    }
+};
+crabatool.LoginAction.registerClass('crabatool.LoginAction', Sys.UI.PageAction);

package/res/login.html

@@ -0,0 +1,102 @@
+<!DOCTYPE html>
+<html lang="zh-cn" translate="no">
+
+<head>
+    <title>NGP开发环境统一登录入口</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf8" />
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <link rel="shortcut icon" type="image/x-icon" href="${modName}/favicon.ico" />
+</head>
+
+<body>
+    <script>
+        var modeName = '${modName}'; // 按各组的模块名称修改
+
+        function startPage() { // 供agency内部调用
+            var authorization = $common.getCookie('ngp-authorization');
+            var ngp_route = $common.getCookie('ngp-route');
+            if (authorization && ngp_route) {
+                $ms.router = {//设置请求路由
+                    debugMs: JSON.parse($common.getCookie('debugMs')),
+                    'ngp-authorization': 'jwt',
+                    'ngp-router': 'ngprt'
+                };
+
+                var routes = localStorage.getItem("routes");
+                if (routes) {
+                    routes = JSON.parse(routes);
+                    if (routes.length > 0) {
+                        var server = {};
+                        for (var i = 0; i < routes.length; i++) {
+                            var r = routes[i];
+                            server[r.serverName] = r.serverIp + ":" + r.serverPort;
+                        }
+                        $ms.server = server;
+                    }
+                }
+
+                var srcs = [];
+                srcs.push('shell/js/help.plug.js?rv=' + Math.random());
+                srcs.push('shell/js/init.js?rv=' + Math.random());
+                $common.loadScript(srcs, function() {
+                    showMainPage();
+                });
+                return;
+            }
+            showLoginPage();
+        }
+
+        function showMainPage() {
+            $skin.loadCss(modeName + '/skins/craba.min.css,shell/skins/shell.css', 'login', function() {
+                $craba.run(modeName + '/Main.gspx', modeName);
+                createLoginBtn();
+            });
+        }
+
+        function showLoginPage() {
+            $skin.loadCss(modeName + '/skins/craba.min.css', 'login', function() {
+                $craba.run('crabatool/Login.gspx', modeName);
+            });
+        }
+
+        function createLoginBtn() {
+            var btn = $common.createClassDiv('Button');
+            btn.innerText = '重新登录';
+            btn.style.cssText = 'z-index: 9999;font-weight: bold;background-color:#03abf5;border:none;position:fixed;bottom:5px;right:5px;';
+            document.body.appendChild(btn);
+            $common.addClickHandler(btn, function() {
+                localStorage.removeItem("route");
+                $common.removeCookie('ngp-authorization');
+                location.reload();
+            });
+        }
+
+        function loadScript(src, cb) {
+            var script = document.createElement('script');
+            script.type = 'text/javascript';
+            script.onload = script.onreadystatechange = function() {
+                if (!this.readyState || this.readyState === "loaded" || this.readyState === "complete") {
+                    script.onload = script.onreadystatechange = script.onerror = null;
+                    cb();
+                }
+            };
+            script.onerror = function() {
+                script.onload = script.onreadystatechange = script.onerror = null;
+                cb();
+            };
+            script.src = src;
+            document.getElementsByTagName('HEAD')[0].appendChild(script);
+        }
+
+        var agencyUrl = 'js/agency.js?vc=' + (new Date()).getTime(); // 加时间戳防止浏览器缓存
+        loadScript(agencyUrl, function() {
+            $agency.load(['js/craba.min.js',
+                'js/crabaEx.min.js',
+                'js/math.min.js',
+                'js/crabaNgp.js'
+            ], {}, startPage); // 这里写死首页脚本,agency内部使用。所有脚本由agency内部版本号防止浏览器缓存
+        });
+    </script>
+</body>
+
+</html>

package/tool/start.js

@@ -87,6 +87,8 @@ class Start {
       { name: '-abortUrl', type: '' },
       { name: '-reportHost', type: '' },
       { name: '-aiHost', type: '' },
+      { name: '-defaultPage', type: '' },
+      { name: '-localLogin', type: 'boolean' },
 
       { name: '-ignoreCheck', type: 'array' },
       { name: '-childModList', type: 'array' },