opti: 增加接口数量统计

client/containers/Project/Interface/InterfaceList/InterfaceList.js

@@ -206,7 +206,7 @@ class InterfaceList extends Component {
 
     return (
       <div style={{ padding: '24px' }}>
-        <h2 className="interface-title" style={{ display: 'inline-block', margin: 0 }}>{intername ? intername : '全部接口'}</h2>
+        <h2 className="interface-title" style={{ display: 'inline-block', margin: 0 }}>{intername ? intername : '全部接口'}共 ({data.length}) 个</h2>
         <Button style={{ float: 'right' }} type="primary" onClick={() => this.setState({ visible: true })}>添加接口</Button>
         <Table className="table-interfacelist" pagination={false} columns={columns} onChange={this.handleChange} dataSource={data} />
         <Modal

common/lib.js

@@ -1,112 +1,61 @@
-const _ =require('underscore');
+const _ = require('underscore');
 
-function getPluginConfig(name, type) {
-  let pluginConfig;
-  if(type === 'ext'){
-    pluginConfig = require('../exts/yapi-plugin-' + name);
-  }else {
-    pluginConfig = require('../node_modules/yapi-plugin-' + name);
-  }
-  
-  if(!pluginConfig || typeof pluginConfig !== 'object'){
-    throw new Error(`Plugin ${name} Config 配置错误，请检查 yapi-plugin-${name}/index.js`);
-  }
-
-  return {
-    server: pluginConfig.server,
-    client: pluginConfig.client 
-  }
+function isObj(object) {
+  return object && typeof (object) == 'object' && Object.prototype.toString.call(object).toLowerCase() == "[object object]";
 }
 
-function isObj(object) {  
-  return object && typeof (object) == 'object' && Object.prototype.toString.call(object).toLowerCase() == "[object object]";  
-}  
+function isArray(object) {
+  return object && typeof (object) == 'object' && object.constructor == Array;
+}
 
-function isArray(object) {  
-  return object && typeof (object) == 'object' && object.constructor == Array;  
-}  
+function getLength(object) {
+  return Object.keys(object).length;
+}
 
-function getLength(object) {  
-  return Object.keys(object).length; 
-}  
-
-function Compare(objA, objB) {  
-  if (!isObj(objA) && !isObj(objB)){
+function Compare(objA, objB) {
+  if (!isObj(objA) && !isObj(objB)) {
     return objA == objB;
   }
-  if (!isObj(objA) || !isObj(objB)) return false;   
-  if (getLength(objA) != getLength(objB)) return false;   
-  return CompareObj(objA, objB, true);  
-}  
-
-function CompareObj(objA, objB, flag) {  
-  for (var key in objA) {  
-      if (!flag)   
-          break;  
-      if (!objB.hasOwnProperty(key)) { flag = false; break; }  
-      if (!isArray(objA[key])) {   
-          if (objB[key] != objA[key]) { flag = false; break; }  
-      } else {  
-          if (!isArray(objB[key])) { flag = false; break; }  
-          var oA = objA[key], oB = objB[key];  
-          if (oA.length != oB.length) { flag = false; break; }  
-          for (var k in oA) {  
-              if (!flag)   
-                  break;  
-              flag = CompareObj(oA[k], oB[k], flag);  
-          }  
-      }  
-  }  
-  return flag;  
-}  
-
-/**
-   * type @string enum[plugin, ext] plugin是外部插件，ext是内部插件
-   */
-exports.initPlugins = function (plugins, type) {
-  if (!plugins) {
-    return [];
-  }
-  if (typeof plugins !== 'object' || !Array.isArray(plugins)) {
-    throw new Error('插件配置有误，请检查', plugins);
-  }
-
-  plugins =  plugins.map(item => {
-    let pluginConfig;
-    if (item && typeof item === 'string') {
-      pluginConfig = getPluginConfig(item, type);
-      return Object.assign({}, pluginConfig, { name: item, enable: true })
-    } else if (item && typeof item === 'object') {
-      pluginConfig = getPluginConfig(item.name, type);
-      return Object.assign({},
-        pluginConfig,
-        {
-          name: item.name,
-          options: item.options,
-          enable: item.enable === false ? false : true
-        })
-    }
-  })
-  plugins =  plugins.filter(item=>{
-    return item.enable === true && (item.server || item.client)
-  })
-
-  return _.uniq(plugins, item=>item.name)
+  if (!isObj(objA) || !isObj(objB)) return false;
+  if (getLength(objA) != getLength(objB)) return false;
+  return CompareObj(objA, objB, true);
 }
+
+function CompareObj(objA, objB, flag) {
+  for (var key in objA) {
+    if (!flag)
+      break;
+    if (!objB.hasOwnProperty(key)) { flag = false; break; }
+    if (!isArray(objA[key])) {
+      if (objB[key] != objA[key]) { flag = false; break; }
+    } else {
+      if (!isArray(objB[key])) { flag = false; break; }
+      var oA = objA[key], oB = objB[key];
+      if (oA.length != oB.length) { flag = false; break; }
+      for (var k in oA) {
+        if (!flag)
+          break;
+        flag = CompareObj(oA[k], oB[k], flag);
+      }
+    }
+  }
+  return flag;
+}
+
 exports.jsonEqual = Compare;
 
-exports.isDeepMatch = function(obj, properties){
-  if(!properties || typeof properties !== 'object' || Object.keys(properties).length === 0){
+exports.isDeepMatch = function (obj, properties) {
+  if (!properties || typeof properties !== 'object' || Object.keys(properties).length === 0) {
     return true;
   }
 
-  if(!obj || typeof obj !== 'object' || Object.keys(obj).length === 0){
+  if (!obj || typeof obj !== 'object' || Object.keys(obj).length === 0) {
     return false;
   }
 
   let match = true;
-  for(var i in properties){
-    if(!Compare(obj[i], properties[i])){
+  for (var i in properties) {
+    if (!Compare(obj[i], properties[i])) {
       match = false;
       break;
     }

common/plugin.js

@@ -0,0 +1,54 @@
+const _ = require('underscore');
+
+function getPluginConfig(name, type) {
+  let pluginConfig;
+  if (type === 'ext') {
+    pluginConfig = require('../exts/yapi-plugin-' + name);
+  } else {
+    pluginConfig = require('../node_modules/yapi-plugin-' + name);
+  }
+
+  if (!pluginConfig || typeof pluginConfig !== 'object') {
+    throw new Error(`Plugin ${name} Config 配置错误，请检查 yapi-plugin-${name}/index.js`);
+  }
+
+  return {
+    server: pluginConfig.server,
+    client: pluginConfig.client
+  }
+}
+
+
+/**
+   * type @string enum[plugin, ext] plugin是外部插件，ext是内部插件
+   */
+exports.initPlugins = function (plugins, type) {
+  if (!plugins) {
+    return [];
+  }
+  if (typeof plugins !== 'object' || !Array.isArray(plugins)) {
+    throw new Error('插件配置有误，请检查', plugins);
+  }
+
+  plugins = plugins.map(item => {
+    let pluginConfig;
+    if (item && typeof item === 'string') {
+      pluginConfig = getPluginConfig(item, type);
+      return Object.assign({}, pluginConfig, { name: item, enable: true })
+    } else if (item && typeof item === 'object') {
+      pluginConfig = getPluginConfig(item.name, type);
+      return Object.assign({},
+        pluginConfig,
+        {
+          name: item.name,
+          options: item.options,
+          enable: item.enable === false ? false : true
+        })
+    }
+  })
+  plugins = plugins.filter(item => {
+    return item.enable === true && (item.server || item.client)
+  })
+
+  return _.uniq(plugins, item => item.name)
+}

package.json

@@ -11,6 +11,14 @@
     "start": " node server/app.js",
     "test": "ava"
   },
+  "scripts-info": {
+    "start": "运行生产环境服务器",
+    "install-server": "初始化数据库数据，用于安装",
+    "dev": "运行开发服务器",
+    "dev-server": "运行后端开发服务器",
+    "dev-client": "运行前端开发服务器",
+    "test": "执行测试"
+  },
   "repository": {
     "type": "git",
     "url": "git@github.com:YMFE/yapi.git"
@@ -159,9 +167,12 @@
     ],
     "plugins": [
       "transform-runtime",
-      ["webpack-alias", {
-        "config": "webpack.alias.js"
-      }]
+      [
+        "webpack-alias",
+        {
+          "config": "webpack.alias.js"
+        }
+      ]
     ]
   },
   "ava": {

server/plugin.js

@@ -1,7 +1,7 @@
 const yapi = require('./yapi.js');
 const plugin_path = yapi.path.join(yapi.WEBROOT, 'node_modules');
 const plugin_system_path = yapi.path.join(yapi.WEBROOT, 'exts');
-const initPlugins = require('../common/lib.js').initPlugins;
+const initPlugins = require('../common/plugin.js').initPlugins;
 var extConfig = require('../common/config.js').exts;
 
 /**
@@ -195,19 +195,7 @@ function emitHook(name) {
     }
 }
 
-function emitHookSync(name) {
-    if (hooks[name] && typeof hooks[name] === 'object') {
-        let args = Array.prototype.slice.call(arguments, 1);
-        if (hooks[name].type === 'single' && typeof hooks[name].listener === 'function') {
-            return hooks[name].listener.apply(yapi, args);
-        }
-        if (Array.isArray(hooks[name].listener)) {
-            hooks[name].listener.forEach((listener) => {
-                listener.apply(yapi, args)
-            })
-        }
-    }
-}
+
 
 
 yapi.bindHook = bindHook;

static/prd/assets.js

@@ -1 +1 @@
-window.WEBPACK_ASSETS = {"index.js":{"js":"index@9975143ed7cec7d6541c.js","css":"index@9975143ed7cec7d6541c.css"},"lib":{"js":"lib@6be3c28f2a25935ebc9b.js"},"lib2":{"js":"lib2@c3e795fca0d63df62c25.js"},"manifest":{"js":"manifest@b67af9f8b578904e66c5.js"}}
+window.WEBPACK_ASSETS = {"index.js":{"js":"index@c1940e67fae07ad70ad6.js","css":"index@c1940e67fae07ad70ad6.css"},"lib":{"js":"lib@0c2b046c5007fe5bdfd4.js"},"lib2":{"js":"lib2@414a869d00281f284b49.js"},"manifest":{"js":"manifest@b67af9f8b578904e66c5.js"}}

ykit.config.js

@@ -1,13 +1,14 @@
 var path = require('path');
 var AssetsPlugin = require('assets-webpack-plugin')
 var CompressionPlugin = require('compression-webpack-plugin')
-var commonLib = require('./common/lib.js');
+var commonLib = require('./common/plugin.js');
 var assetsPluginInstance = new AssetsPlugin({
   filename: 'static/prd/assets.js',
   processOutput: function (assets) {
     return 'window.WEBPACK_ASSETS = ' + JSON.stringify(assets);
   }
 })
+var fs = require('fs');
 
 
 var compressPlugin = new CompressionPlugin({
@@ -18,21 +19,13 @@ var compressPlugin = new CompressionPlugin({
   minRatio: 0.8
 });
 
-function fileExist (filePath){
-  try {
-      return fs.statSync(filePath).isFile();
-  } catch (err) {
-      return false;
-  }
-};
-
 function createScript(plugin, pathAlias){
   let options = plugin.options ? JSON.stringify(plugin.options) : null
   return `"${plugin.name}" : {module: require('${pathAlias}/yapi-plugin-${plugin.name}/client.js'),options: ${options}}`
 }
 
 function initPlugins(configPlugin){
-  var configPlugin = require('../config.json').plugins;
+  configPlugin = require('../config.json').plugins;
   var systemConfigPlugin = require('./common/config.js').exts;
 
   var scripts = [] ;