crabatool 1.0.815 → 1.0.817

package/lib/server.js

@@ -160,6 +160,21 @@ function createServer(app, options) {
 
   app.webPath = webPath; // handler.js里面动态获取当前app的网站路径（多个server实例的时候需要）
 
+
+  // 业务ap的代理转发（可能转发静态资源，放到前面）
+  if (config.proxy) {
+    var { createProxyMiddleware } = require('http-proxy-middleware');
+    if (Array.isArray(config.proxy)) { // 兼容代理配置是数组
+      for (const item of config.proxy) {
+        app.use(createProxyMiddleware(item))
+      }
+    } else {
+      for (let key in config.proxy) {
+        app.use(key, createProxyMiddleware(config.proxy[key]));
+      }
+    }
+  }
+
   app.use(express.static(webPath, {
     maxage: '100h', // 强制缓存资源
     setHeaders: function(res, pathname, stat) {
@@ -180,20 +195,6 @@ function createServer(app, options) {
     }
   }));
 
-  // 业务ap的代理转发
-  if (config.proxy) {
-    var { createProxyMiddleware } = require('http-proxy-middleware');
-    if (Array.isArray(config.proxy)) { // 兼容代理配置是数组
-      for (const item of config.proxy) {
-        app.use(createProxyMiddleware(item))
-      }
-    } else {
-      for (let key in config.proxy) {
-        app.use(key, createProxyMiddleware(config.proxy[key]));
-      }
-    }
-  }
-
   var bodyParser = require('body-parser');
   app.use(bodyParser.json(utils._getJsonDefaultOptions({})));
   app.use(bodyParser.raw(utils._getJsonDefaultOptions({})));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "crabatool",
-  "version": "1.0.815",
+  "version": "1.0.817",
   "description": "crabatool",
   "main": "index.js",
   "bin": {

package/tool/addNodeId.js

@@ -559,7 +559,7 @@ function createAttributeInsertion(body, node, newId) {
   const tagName = node.name || '';
   const attrName = tagName.endsWith('Column') && tagName !== 'FlexColumn' ? 'Name' : 'ID';
 
-  if (node.attribs && node.attribs[attrName]) {
+  if (node.attribs && (node.attribs[attrName] || (attrName === 'Name' && node.attribs.ExpandName))) {
     return null;
   }
 
@@ -620,7 +620,7 @@ const filter = (attrs, tagName) => {
   }
 
   if (tagName.endsWith('Column') && tagName !== 'FlexColumn') {
-    return !!attrs.Name || !!attrs.DataField;;
+    return !!attrs.Name || !!attrs.DataField || !!attrs.ExpandName;
   }
 
   return !!attrs.ID || !!attrs.DataField;