@lixianwei/elpis 1.0.0 → 1.0.2

package/app/extend/datebase.js

@@ -0,0 +1,5 @@
+module.exports =(app)=>{
+    const {db:dbConfig} = app.config;
+    if(!dbConfig){ return; }
+    return require('knex')(dbConfig);
+}

package/app/middleware/api-sign-verify.js

@@ -3,7 +3,11 @@ const md5 =require('md5');
 * API 签名合法性校验
 * */
 module.exports =(app)=>{
-    return  async(ctx, next)=>{
+    return async(ctx, next)=>{
+        // 校验白名单
+        if(app.config?.apiSignVerify.whiteList.includes(ctx.path)){
+            return await next();
+        }
         // 只对api请求进行校验
         if(ctx.path.indexOf('/api') < 0){
             return await next();

package/app/middleware.js

@@ -1,7 +1,9 @@
 const path = require('path');
+
 module.exports =(app)=>{
     // 配置静态根目录
-    const KoaStatic = require('koa-static');
+    const KoaStatic = require("koa-static");
+    app.use(KoaStatic(path.resolve(__dirname, './public')));
     app.use(KoaStatic(path.resolve(process.cwd(), './app/public')));
 
     // 模板引擎渲染

package/app/pages/dashboard/complex-view/schema-view/components/detail-panel/detail-panel.vue

@@ -56,7 +56,7 @@ const show = (rowData)=>{
 const fetchFormData = async ()=>{
   if(loading.value){return}
   loading.value = true
-  const res = await  $curl({
+  const res = await $curl({
     method: 'get',
     url:api.value,
     query:{
@@ -94,6 +94,13 @@ defineExpose({
     }
     .item-value{
       color: #d2dae4;
+      display: block;
+      width: 250px;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+      word-break: break-all;
+      overflow-wrap:break-word;
     }
   }
 

package/app/pages/dashboard/complex-view/schema-view/hook/schema.js

@@ -58,6 +58,7 @@ export const useSchema = function (){
                         }
                     }
                     components.value = dtoComponents
+
                 }
 
             })

package/app/pages/widgets/header-container/header-container.vue

@@ -13,16 +13,10 @@
         <el-row type="flex" align="middle" justify="end" class="setting-panel">
         <!-- 插槽设置区域-->
           <slot name="setting-content"></slot>
-          <img src="./asserts/avatar.png" alt="" class="avatar">
-          <el-dropdown @command="handleUserCommand">
-            <span class="username">
-              {{userName}}
-              <i class="el-icon-arrow-down el-icon--right"></i>
-            </span>
-            <template #dropdown>
-              <el-dropdown-item command="logout">退出登录</el-dropdown-item>
-            </template>
-          </el-dropdown>
+          <component
+              v-if="BusinessHeaderConfig?.userPanel"
+              :is="BusinessHeaderConfig?.userPanel?.component"
+          ></component>
         </el-row>
       </el-row>
     </el-header>
@@ -34,16 +28,12 @@
 </template>
 
 <script setup>
-import {ref} from 'vue';
+import BusinessHeaderConfig from '$businessHeaderConfig'
 defineProps({
   title: String,
 })
 
-const userName = ref('管理员')
 
-const handleUserCommand =(e)=>{
-  console.log(e)
-}
 </script>
 
 
@@ -76,20 +66,7 @@ const handleUserCommand =(e)=>{
       .setting-panel{
         margin-left: auto;
         min-width: 180px;
-        .avatar{
-          margin-right: 10px;
-          width: 30px;
-          height: 30px;
-          border-radius: 50%;
-        }
-        .username{
-          font-size: 16px;
-          font-weight: 500;
-          cursor: pointer;
-          height: 60px;
-          line-height: 60px;
-          outline: none;
-        }
+
       }
 
     }

package/app/webpack/config/webpack.base.js

@@ -138,6 +138,11 @@ module.exports= merge.smart({
             // 业务 search -bar 配置扩展
             const businessSchemaSearchBar = path.resolve(process.cwd(),'./app/pages/widgets/schema-search-bar/search-item-config.js');
             aliasMap['$businessSearchItemConfig'] = fs.existsSync(businessSchemaSearchBar) ? businessSchemaSearchBar:blankModulePath
+
+            //header-container  扩展配置
+            const businessHeaderConfig = path.resolve(process.cwd(),'./app/pages/widgets/header-container/header-config.js');
+            aliasMap['$businessHeaderConfig'] = fs.existsSync(businessHeaderConfig) ? businessHeaderConfig:blankModulePath
+
             return {
                 'vue':require.resolve('vue'),
                 '@babel/runtime/helpers/asyncToGenerator':require.resolve('@babel/runtime/helpers/asyncToGenerator'),

package/app/webpack/dev.js

@@ -10,13 +10,11 @@ module.exports = () => {
 // 从webpack.dev.js获取webpack配置和devServer配置
     const {webpackConfig,DEV_SERVER_CONFIG} = require('./config/webpack.dev.js');
 
-    console.log('9999',webpackConfig)
-
     const app = express();
 
     const compiler = webpack(webpackConfig);
 // 指定静态文件目录
-    app.use(express.static(path.join(__dirname, '../public/dist')));
+    app.use(express.static(path.join(process.cwd(), './app/public/dist')));
 // 引用devMiddleware 中间件（监控文件改动）
     app.use(devMiddleware(compiler, {
         // 落地文件

package/app/webpack/prod.js

@@ -1,7 +1,6 @@
 const webpack = require('webpack')
 const webpackProdConfig = require('./config/webpack.prod.js')
 module.exports = () => {
-    console.log('building...')
     webpack(webpackProdConfig,(err, stats) => {
         if (err) {
             console.log(err)

package/elpis-core/index.js

@@ -34,7 +34,7 @@ module.exports ={
 
         // 初始化环境配置
         app.env = env();
-        console.log(`----${app.env.get()}---`);
+        // console.log(`----${app.env.get()}---`);
         // 加载config
         configLoader(app)
         console.log(`----start config-----`);

package/elpis-core/loader/config.js

@@ -19,7 +19,7 @@ module.exports = (app) => {
 
     // 业务config目录及相关文件
     const businessConfigPath = path.resolve(process.cwd(),`.${sep}config`);
-    console.log(businessConfigPath)
+    // console.log(businessConfigPath)
 
     // 获取default.config
     try{
@@ -28,7 +28,7 @@ module.exports = (app) => {
             ...require(path.resolve(businessConfigPath,`.${sep}config.default.js`))
         }
     }catch(e){
-        console.log('there is no default.config file')
+        console.log('[exception] default.config file exception')
     }
 
     // 获取env.config
@@ -46,7 +46,7 @@ module.exports = (app) => {
             console.log(envConfig,'_ENV')
         }
     }catch(e){
-        console.log('there is no config file')
+        console.log('[exception]  env.config file exception')
     }
     // 覆盖并加载config配置
     app.config = Object.assign({},defaultConfig,envConfig);

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "@lixianwei/elpis",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "",
   "main": "index.js",
   "scripts": {
     "test": "cross-env _ENV=local mocha test/**/*.js",
     "lint": "eslint --quiet --ext js,vue ."
-
   },
   "repository": {
     "type": "git",
@@ -16,14 +15,28 @@
   "license": "ISC",
   "dependencies": {
     "@babel/core": "^7.24.0",
+    "@babel/plugin-transform-runtime": "^7.1.0",
+    "@babel/preset-env": "^7.4.5",
     "@babel/runtime": "^7.24.0",
     "@element-plus/icons-vue": "^2.3.2",
     "ajv": "^6.10.2",
     "axios": "^0.19.2",
+    "babel-loader": "^8.0.4",
+    "clean-webpack-plugin": "^0.1.19",
+    "consoler": "^0.2.0",
+    "cross-env": "^10.1.0",
+    "css-loader": "^0.23.1",
+    "css-minimizer-webpack-plugin": "^5.0.1",
+    "directory-named-webpack-plugin": "^4.0.1",
     "echarts": "^5.5.0",
     "element-plus": "^2.3.7",
+    "express": "^4.18.2",
+    "file-loader": "^6.2.0",
     "generate-password": "^1.7.1",
     "glob": "^7.1.4",
+    "happypack": "^5.0.1",
+    "html-webpack-inject-attributes-plugin": "^1.0.1",
+    "html-webpack-plugin": "^5.5.3",
     "jsonwebtoken": "^9.0.2",
     "knex": "^0.19.0",
     "koa": "2.7.0",
@@ -34,41 +47,27 @@
     "koa-useragent": "2.0.0",
     "koa2-cors": "^2.0.6",
     "less": "^3.8.1",
+    "less-loader": "^11.1.3",
     "lodash": "^4.17.21",
     "log4js": "^6.9.1",
     "md5": "^2.2.1",
+    "mini-css-extract-plugin": "^2.7.6",
     "moment": "^2.29.4",
     "mysql": "^2.18.1",
     "node-schedule": "^2.1.1",
     "nodemon": "^1.19.2",
     "path": "^0.12.7",
     "pinia": "^2.1.6",
-    "superagent": "^8.1.2",
-    "vue": "^3.3.4",
-    "vue-json-viewer": "^3.0.4",
-    "vue-router": "^4.2.4",
-    "vuex": "^4.1.0",
-    "@babel/plugin-transform-runtime": "^7.1.0",
-    "@babel/preset-env": "^7.4.5",
-    "babel-loader": "^8.0.4",
-    "clean-webpack-plugin": "^0.1.19",
-    "consoler": "^0.2.0",
-    "cross-env": "^10.1.0",
-    "css-loader": "^0.23.1",
-    "css-minimizer-webpack-plugin": "^5.0.1",
-    "directory-named-webpack-plugin": "^4.0.1",
-    "express": "^4.18.2",
-    "file-loader": "^6.2.0",
-    "happypack": "^5.0.1",
-    "html-webpack-inject-attributes-plugin": "^1.0.1",
-    "html-webpack-plugin": "^5.5.3",
-    "less-loader": "^11.1.3",
-    "mini-css-extract-plugin": "^2.7.6",
     "style-loader": "^0.14.1",
+    "superagent": "^8.1.2",
     "terser-webpack-plugin": "^5.6.1",
     "url-loader": "^4.1.1",
+    "vue": "^3.3.4",
+    "vue-json-viewer": "^3.0.4",
     "vue-loader": "^17.2.2",
+    "vue-router": "^4.2.4",
     "vue-style-loader": "^4.1.2",
+    "vuex": "^4.1.0",
     "webpack": "^5.88.1",
     "webpack-dev-middleware": "^6.1.1",
     "webpack-hot-middleware": "^2.25.4",