@huangzongxin/elpis 1.0.0 → 1.0.1

package/README.md

@@ -1,6 +1,6 @@
 model配置
 {
-mode: 'dashboard', // 模版类型，不同模版类型对应不一样的模版数据结构
+model: 'dashboard', // 模版类型，不同模版类型对应不一样的模版数据结构
 name: '', // 名称
 desc: '', // 描述
 icon: '', // icon
@@ -178,6 +178,3 @@ schema-form 控件扩展
 schema-search-bar 控件扩展
 在 app/widgets/schema-search-bar/complex-view 下写控件
 配置到 app/widgets/schema-search-bar/search-item-config.js
-
-
-

package/app/extend/database.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

@@ -5,6 +5,10 @@ const md5 = require("md5");
 
 module.exports = (app) => {
   return async (ctx, next) => {
+    // 校验白名单
+    if (app.config?.aipSignVerify.whiteList.includes(ctx.path)) {
+      return await next();
+    }
     // 只对api请求进行校验
     if (ctx.path.indexOf("/api") < 0) {
       return await next();

package/app/middleware.js

@@ -4,6 +4,8 @@ const koaNunjucks = require("koa-nunjucks-2");
 module.exports = (app) => {
   // 配置静态根目录
   const koaStatic = require("koa-static");
+
+  app.use(koaStatic(path.resolve(__dirname, "./public")));
   app.use(koaStatic(path.resolve(process.cwd(), "./app/public")));
 
   // 加载模板引擎

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

@@ -13,15 +13,9 @@
         <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 elicon--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>
@@ -33,15 +27,11 @@
 </template>
 
 <script setup>
-import { ref } from "vue";
+import BusinessHeaderConfig from '$businessHeaderConfig'
 defineProps({
   title: String
 })
-const userName = ref('Kris')
-const handleUserCommand = function (event) {
-  console.log(event);
 
-}
 </script>
 
 <style lang="less" scoped>
@@ -52,7 +42,7 @@ const handleUserCommand = function (event) {
 
   .header {
     max-height: 120px;
-    border-bottom: 1px solid #E8E8E8; 
+    border-bottom: 1px solid #E8E8E8;
 
     .header-row {
       height: 60px;
@@ -79,21 +69,7 @@ const handleUserCommand = function (event) {
         margin-left: auto;
         min-width: 180px;
 
-        .avatar {
-          margin-right: 12px;
-          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/pages/widgets/schema-search-bar/schema-search-bar.vue

@@ -2,7 +2,7 @@
   <el-form v-if="schema && schema.properties" :inline="true" class="schema-search-bar">
     <!-- 动态组件 -->
     <el-form-item v-for="(schemaItem, key) in schema.properties" :key="key" :label="schemaItem.label">
-      <component :ref="searchComList" :is="SearchItemConfig[schemaItem.option?.comType]?.component" :schemaKey="key"
+      <component ref="searchComList" :is="SearchItemConfig[schemaItem.option?.comType]?.component" :schemaKey="key"
         :schema="schemaItem" @loaded="handleChildLoaded" @reset="reset" />
     </el-form-item>
     <!-- 操作区域 -->

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

@@ -176,6 +176,15 @@ module.exports = merge.smart(
           ? businessSearchItemConfig
           : 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"),
           $elpisPages: path.resolve(__dirname, "../../pages"),

package/app/webpack/dev.js

@@ -18,7 +18,7 @@ module.exports = () => {
   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/elpis-core/loader/config.js

@@ -30,7 +30,7 @@ module.exports = (app) => {
       ...require(path.resolve(businessConfigPath, `.${sep}config.default.js`)),
     };
   } catch (error) {
-    console.error(`default config not found: ${businessConfigPath}`);
+    console.error(`[exception] default.config file exception`);
   }
   //获取 env.config
   let envConfig = {};
@@ -52,7 +52,7 @@ module.exports = (app) => {
       );
     }
   } catch (error) {
-    console.error(`env config not found: ${businessConfigPath}`);
+    console.error(`[exception] default.config file exception`);
   }
   //合并配置
   app.config = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@huangzongxin/elpis",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "elpis 一个企业级应用框架，通过全栈实现",
   "main": "index.js",
   "scripts": {
@@ -15,13 +15,26 @@
   "license": "ISC",
   "dependencies": {
     "@babel/core": "^7.24.0",
+    "@babel/plugin-transform-runtime": "^7.1.0",
+    "@babel/preset-env": "^7.4.5",
     "@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",
+    "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",
@@ -32,40 +45,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.5.32",
-    "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",
-    "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.0.0",
     "url-loader": "^4.1.1",
+    "vue": "^3.5.32",
+    "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",