lxm1993 发布系统代码 [TrainSys，网页端]

app_Web/package.json

@@ -12,12 +12,12 @@
   },
   "dependencies": {
     "@ibiz-template/command": "0.0.1-alpha.13",
-    "@ibiz-template/controller": "0.0.1-alpha.16",
-    "@ibiz-template/core": "0.0.1-alpha.16",
-    "@ibiz-template/model": "0.0.1-alpha.16",
-    "@ibiz-template/runtime": "0.0.1-alpha.16",
-    "@ibiz-template/service": "0.0.1-alpha.16",
-    "@ibiz-template/vue-util": "0.0.1-alpha.16",
+    "@ibiz-template/controller": "0.0.1-alpha.17",
+    "@ibiz-template/core": "0.0.1-alpha.17",
+    "@ibiz-template/model": "0.0.1-alpha.17",
+    "@ibiz-template/runtime": "0.0.1-alpha.17",
+    "@ibiz-template/service": "0.0.1-alpha.17",
+    "@ibiz-template/vue-util": "0.0.1-alpha.17",
     "dayjs": "^1.11.5",
     "ionicons": "^6.0.3",
     "lodash-es": "^4.17.21",

app_Web/pnpm-lock.yaml

@@ -4,12 +4,12 @@ specifiers:
   '@commitlint/cli': ^17.1.2
   '@commitlint/config-conventional': ^17.1.0
   '@ibiz-template/command': 0.0.1-alpha.13
-  '@ibiz-template/controller': 0.0.1-alpha.16
-  '@ibiz-template/core': 0.0.1-alpha.16
-  '@ibiz-template/model': 0.0.1-alpha.16
-  '@ibiz-template/runtime': 0.0.1-alpha.16
-  '@ibiz-template/service': 0.0.1-alpha.16
-  '@ibiz-template/vue-util': 0.0.1-alpha.16
+  '@ibiz-template/controller': 0.0.1-alpha.17
+  '@ibiz-template/core': 0.0.1-alpha.17
+  '@ibiz-template/model': 0.0.1-alpha.17
+  '@ibiz-template/runtime': 0.0.1-alpha.17
+  '@ibiz-template/service': 0.0.1-alpha.17
+  '@ibiz-template/vue-util': 0.0.1-alpha.17
   '@types/lodash-es': ^4.17.6
   '@types/node': ^18.8.3
   '@types/qs': ^6.9.7
@@ -60,12 +60,12 @@ specifiers:
 
 dependencies:
   '@ibiz-template/command': 0.0.1-alpha.13
-  '@ibiz-template/controller': 0.0.1-alpha.16_3vyzyqdsfjj2uuejjjk5alwidq
-  '@ibiz-template/core': 0.0.1-alpha.16_amgpmzcbvys7f63sicqtedd4k4
-  '@ibiz-template/model': 0.0.1-alpha.16_amgpmzcbvys7f63sicqtedd4k4
-  '@ibiz-template/runtime': 0.0.1-alpha.16_hfpvjyl7tcjqp2uqrwytqjd3dq
-  '@ibiz-template/service': 0.0.1-alpha.16_olo3fw5kxwfldkalipgpgtirfq
-  '@ibiz-template/vue-util': 0.0.1-alpha.16_d55f7qedagx7tksktpnydpksnu
+  '@ibiz-template/controller': 0.0.1-alpha.17_wfp7q2uctvhlhhlrlnhgbjgcsy
+  '@ibiz-template/core': 0.0.1-alpha.17_amgpmzcbvys7f63sicqtedd4k4
+  '@ibiz-template/model': 0.0.1-alpha.17_amgpmzcbvys7f63sicqtedd4k4
+  '@ibiz-template/runtime': 0.0.1-alpha.17_mx4bqaqyqemg5c7e4jdswp47rm
+  '@ibiz-template/service': 0.0.1-alpha.17_inoskdzabxhqgrexcp6dlvtxzy
+  '@ibiz-template/vue-util': 0.0.1-alpha.17_pl2ksujy37vm2gxtwaeqxwtfda
   dayjs: 1.11.5
   ionicons: 6.0.3
   lodash-es: 4.17.21
@@ -661,8 +661,8 @@ packages:
     resolution: {integrity: sha512-IUD6x29nmmxdL8XbGGfBAEYlPO/+E8qHd/TI2ncgaaBFcF6M4ih7xga8l1oYuSdr+xx4mlXkAbzQFOqAQWm21g==}
     dev: false
 
-  /@ibiz-template/controller/0.0.1-alpha.16_3vyzyqdsfjj2uuejjjk5alwidq:
-    resolution: {integrity: sha512-6ES/q892/Gm+TKKOH519PV3JyBpCQMP5Hpk/qO2iYdFC5GZJFSLbD/tz9IO8YcIPA32u4bkV8otxiV7q/S+L7A==}
+  /@ibiz-template/controller/0.0.1-alpha.17_wfp7q2uctvhlhhlrlnhgbjgcsy:
+    resolution: {integrity: sha512-Ux9mDMNe7MQP4nb0f2P1gKFEakUiSQHeRdGHiwXY6TvW3v3cgaUAGrMhzk4KmCKPh5ePaZ0Yn6bUZ3i1zofztg==}
     peerDependencies:
       '@ibiz-template/core': ^0.0.1-alpha.2
       '@ibiz-template/model': ^0.0.1-alpha.2
@@ -671,18 +671,18 @@ packages:
       lodash-es: ^4.17.21
       qx-util: ^0.4.1
     dependencies:
-      '@ibiz-template/core': 0.0.1-alpha.16_amgpmzcbvys7f63sicqtedd4k4
-      '@ibiz-template/model': 0.0.1-alpha.16_amgpmzcbvys7f63sicqtedd4k4
-      '@ibiz-template/runtime': 0.0.1-alpha.16_hfpvjyl7tcjqp2uqrwytqjd3dq
-      '@ibiz-template/service': 0.0.1-alpha.16_olo3fw5kxwfldkalipgpgtirfq
+      '@ibiz-template/core': 0.0.1-alpha.17_amgpmzcbvys7f63sicqtedd4k4
+      '@ibiz-template/model': 0.0.1-alpha.17_amgpmzcbvys7f63sicqtedd4k4
+      '@ibiz-template/runtime': 0.0.1-alpha.17_mx4bqaqyqemg5c7e4jdswp47rm
+      '@ibiz-template/service': 0.0.1-alpha.17_inoskdzabxhqgrexcp6dlvtxzy
       async-validator: 4.2.5
       dayjs: 1.11.5
       lodash-es: 4.17.21
       qx-util: 0.4.1
     dev: false
 
-  /@ibiz-template/core/0.0.1-alpha.16_amgpmzcbvys7f63sicqtedd4k4:
-    resolution: {integrity: sha512-Wt1J6hUmMopF9MfXj2tMTFoNiNnhYsEL78Jjmj4f2ZPVZd5+EDBk4ricGfw5aNNB74TPoqrX/vvpIVGEAlngGA==}
+  /@ibiz-template/core/0.0.1-alpha.17_amgpmzcbvys7f63sicqtedd4k4:
+    resolution: {integrity: sha512-jicy/kMM+A92+kbai7JEPt5+O4hyiCkRVahTe5dx3/bxOLQntvd0rwDUUPidQ1N1GYkcZzTC/6V7hG/x5imCSw==}
     peerDependencies:
       lodash-es: ^4.17.21
       qx-util: ^0.4.1
@@ -696,8 +696,8 @@ packages:
       - debug
     dev: false
 
-  /@ibiz-template/model/0.0.1-alpha.16_amgpmzcbvys7f63sicqtedd4k4:
-    resolution: {integrity: sha512-QlrUeXkU9UaN6A/k2v9ElGw0n8lzD8pS/OFbc5SFcyXj9iTdKQk/wWk4qVRXKWhDOCzhAixTwxn7k+Z3bLtPAA==}
+  /@ibiz-template/model/0.0.1-alpha.17_amgpmzcbvys7f63sicqtedd4k4:
+    resolution: {integrity: sha512-CSwdXtHs/HyPKOL2hWMhMakl+zvj3kjHnuCvWk445iEl9UpaSzohpQFWJhxhlZrWJf5hHWP8wqaqTRBGEcVXjQ==}
     peerDependencies:
       lodash-es: ^4.17.21
       qx-util: ^0.4.1
@@ -708,8 +708,8 @@ packages:
       qx-util: 0.4.1
     dev: false
 
-  /@ibiz-template/runtime/0.0.1-alpha.16_hfpvjyl7tcjqp2uqrwytqjd3dq:
-    resolution: {integrity: sha512-it9CF4XEUEY5hWeiHwnMw3tW3v3IK7fxiWmRJADItUn5fs+rZnzfh/6pOKY2duj2o1yUnUzbSFrjw8owOOhx8Q==}
+  /@ibiz-template/runtime/0.0.1-alpha.17_mx4bqaqyqemg5c7e4jdswp47rm:
+    resolution: {integrity: sha512-YuhTXOIahC7oXURULX//0oz4gHtcRvr8FyKbxpRy1N6fM+9SsX2p/NN6Uqn3gnmEGrVNsnngOsYF58HNxq14Kw==}
     peerDependencies:
       '@ibiz-template/core': ^0.0.1-alpha.2
       '@ibiz-template/model': ^0.0.1-alpha.2
@@ -717,28 +717,28 @@ packages:
       qx-util: ^0.4.1
     dependencies:
       '@ibiz-template/command': 0.0.1-alpha.13
-      '@ibiz-template/core': 0.0.1-alpha.16_amgpmzcbvys7f63sicqtedd4k4
-      '@ibiz-template/model': 0.0.1-alpha.16_amgpmzcbvys7f63sicqtedd4k4
-      '@ibiz-template/service': 0.0.1-alpha.16_olo3fw5kxwfldkalipgpgtirfq
+      '@ibiz-template/core': 0.0.1-alpha.17_amgpmzcbvys7f63sicqtedd4k4
+      '@ibiz-template/model': 0.0.1-alpha.17_amgpmzcbvys7f63sicqtedd4k4
+      '@ibiz-template/service': 0.0.1-alpha.17_inoskdzabxhqgrexcp6dlvtxzy
       qx-util: 0.4.1
     dev: false
 
-  /@ibiz-template/service/0.0.1-alpha.16_olo3fw5kxwfldkalipgpgtirfq:
-    resolution: {integrity: sha512-GJSk3lnvRYbylq8/di9MG6nPhVSaAR7S2GRInF0Uzj0mpqOVDr61YkdTBIvtCn1nZTSuXlu5NbfBxAhLmBaN1w==}
+  /@ibiz-template/service/0.0.1-alpha.17_inoskdzabxhqgrexcp6dlvtxzy:
+    resolution: {integrity: sha512-1heznFO8r9PskHoGVydFoNjAjYXeyoS8Amik0HPNkufV+SuGal56XC+Lp2Kv7J8XQd0yv8cfStKNl9oT/iFb3g==}
     peerDependencies:
       '@ibiz-template/core': ^0.0.1-alpha.2
       '@ibiz-template/model': ^0.0.1-alpha.2
       qx-util: ^0.4.1
       ramda: ^0.28.0
     dependencies:
-      '@ibiz-template/core': 0.0.1-alpha.16_amgpmzcbvys7f63sicqtedd4k4
-      '@ibiz-template/model': 0.0.1-alpha.16_amgpmzcbvys7f63sicqtedd4k4
+      '@ibiz-template/core': 0.0.1-alpha.17_amgpmzcbvys7f63sicqtedd4k4
+      '@ibiz-template/model': 0.0.1-alpha.17_amgpmzcbvys7f63sicqtedd4k4
       qx-util: 0.4.1
       ramda: 0.28.0
     dev: false
 
-  /@ibiz-template/vue-util/0.0.1-alpha.16_d55f7qedagx7tksktpnydpksnu:
-    resolution: {integrity: sha512-xxtPlFhfyOXrH6k1rgGVNuVm9NEM96JR06Tly9cbxp4bdldsbO6+tRzk9n6DDcsbyrSacnIkUy6rHm2gXKvOPg==}
+  /@ibiz-template/vue-util/0.0.1-alpha.17_pl2ksujy37vm2gxtwaeqxwtfda:
+    resolution: {integrity: sha512-y50eRerVgusPgLnXlYfEN3Hd2aMCuTtgujzHceU+x7wDsPYElm789EdN0cs/9vceOm0PgxdBEUDkG126Oyr9yA==}
     peerDependencies:
       '@ibiz-template/controller': '>=0.0.1-alpha.2'
       '@ibiz-template/core': '>=0.0.1-alpha.2'
@@ -748,9 +748,9 @@ packages:
       vue: ^2.7.10
       vue-router: ^3.6.4
     dependencies:
-      '@ibiz-template/controller': 0.0.1-alpha.16_3vyzyqdsfjj2uuejjjk5alwidq
-      '@ibiz-template/core': 0.0.1-alpha.16_amgpmzcbvys7f63sicqtedd4k4
-      '@ibiz-template/model': 0.0.1-alpha.16_amgpmzcbvys7f63sicqtedd4k4
+      '@ibiz-template/controller': 0.0.1-alpha.17_wfp7q2uctvhlhhlrlnhgbjgcsy
+      '@ibiz-template/core': 0.0.1-alpha.17_amgpmzcbvys7f63sicqtedd4k4
+      '@ibiz-template/model': 0.0.1-alpha.17_amgpmzcbvys7f63sicqtedd4k4
       qs: 6.11.0
       qx-util: 0.4.1
       vue: 2.7.10

app_Web/public/assets/css/app-loading.css

@@ -4,7 +4,7 @@
     position: absolute;
     top: 0;
     left: 0;
-    z-index: 10000;
+    z-index: 1000;
     width: 100%;
     height: 100%;
     overflow: hidden;

app_Web/public/environments/environment.js

+window.Environment = {
+  // 远端动态基础路径
+  remoteDynaPath: '/remotemodel',
+  // 应用请求基础路径
+  BaseUrl: 'pms__sclpmswebapp',
+  // 中心系统标识
+  mockDcSystemId: 'pms',
+  // 应用标题
+  AppTitle: '应用首页',
+  // 登录模式
+  loginMode: 'CAS',
+  // 中央认证登录地址
+  casLoginUrl: 'http://sso.mcoatest.js.cmcc:9000/sysso/login'
+};

app_Web/src/attach-environment-config.ts

+const envMap = new Map([
+  ['baseUrl', 'BaseUrl'],
+  ['remoteModelUrl', 'remoteDynaPath'],
+  ['dcSystem', 'mockDcSystemId'],
+  ['enablePermission', 'enablePermissionValid'],
+]);
+
 export async function attachEnvironmentConfig(): Promise<void> {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const env = (window as any).Environment;
-  ibiz.env.baseUrl = env.BaseUrl;
-  ibiz.env.remoteModelUrl = env.remoteDynaPath;
-  ibiz.env.dcSystem = env.mockDcSystemId;
-  ibiz.env.casLoginUrl = env.casLoginUrl;
+
+  // environment.js里的值覆盖到ibiz.env里，名称不一致的按envMap映射去修改。
+  Object.keys(ibiz.env).forEach(key => {
+    const key2 = envMap.has(key) ? envMap.get(key)! : key;
+    if (env[key2]) {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (ibiz.env as any)[key] = env[key2];
+    }
+  });
+
   if (env.AppTitle) {
     document.title = env.AppTitle;
   }

app_Web/src/components/router-shell/router-shell.tsx

@@ -33,7 +33,7 @@ export default defineComponent({
         try {
           viewData.value = parseRouteViewData(appModel, route, props.level);
         } catch (error) {
-          router.push(`/${route.params.view1}/404`);
+          router.replace(`/${route.params.view1}/404`);
         }
         // 确定视图组件
         viewComponentName.value = getViewComponentName(

app_Web/src/components/widgets/app-menu/app-menu.tsx

@@ -23,6 +23,7 @@ import {
   watch,
 } from 'vue';
 import '@/styles/components/widgets/app-menu/app-menu.scss';
+import { AppMenuController } from '@ibiz-template/controller';
 /**
  * 递归生成菜单数据，递给 antd 的 Menu 组件
  *
@@ -52,7 +53,15 @@ function getMenus(items: AppMenuItemModel[]): IData[] {
  * @param {IData} menu
  * @returns {*}
  */
-function renderMenuItem(menu: IData, collapseChange: boolean, ns: Namespace) {
+function renderMenuItem(
+  menu: IData,
+  collapseChange: boolean,
+  ns: Namespace,
+  c: AppMenuController,
+) {
+  if (!c.menuItemsState[menu.key].visible) {
+    return;
+  }
   return !collapseChange ? (
     <i-menu-item class={ns.e('item')} name={menu.key}>
       <app-icon class={ns.e('icon')} icon={menu.image}></app-icon>
@@ -84,7 +93,11 @@ function renderDropDownMenuItem(
   menu: IData,
   collapseChange: boolean,
   ns: Namespace,
+  c: AppMenuController,
 ) {
+  if (!c.menuItemsState[menu.key].visible) {
+    return;
+  }
   return (
     <i-dropdown-item class={ns.be('submenu', 'item')} name={menu.key}>
       <i-menu-item name={menu.key}>{menu.label}</i-menu-item>
@@ -104,7 +117,11 @@ function renderSubmenu(
   subMenu: IData,
   collapseChange: boolean,
   ns: Namespace,
+  c: AppMenuController,
 ) {
+  if (!c.menuItemsState[subMenu.key].visible) {
+    return;
+  }
   return !collapseChange ? (
     <i-submenu name={subMenu.key}>
       <template slot='title'>
@@ -113,9 +130,9 @@ function renderSubmenu(
       </template>
       {subMenu.children.map((item: IData) => {
         if (item.children) {
-          return renderSubmenu(false, item, collapseChange, ns);
+          return renderSubmenu(false, item, collapseChange, ns, c);
         }
-        return renderMenuItem(item, collapseChange, ns);
+        return renderMenuItem(item, collapseChange, ns, c);
       })}
     </i-submenu>
   ) : (
@@ -135,9 +152,9 @@ function renderSubmenu(
       <i-dropdown-menu class={ns.be('submenu', 'list')} slot='list'>
         {subMenu.children.map((item: IData) => {
           if (item.children) {
-            return renderSubmenu(false, item, collapseChange, ns);
+            return renderSubmenu(false, item, collapseChange, ns, c);
           }
-          return renderDropDownMenuItem(item, collapseChange, ns);
+          return renderDropDownMenuItem(item, collapseChange, ns, c);
         })}
       </i-dropdown-menu>
     </i-dropdown>
@@ -263,7 +280,7 @@ export const AppMenu = defineComponent({
       updateMenu();
     });
 
-    return { menus, onClick, ns, defaultActive, defaultOpens };
+    return { menus, c, onClick, ns, defaultActive, defaultOpens };
   },
   render() {
     return (
@@ -278,9 +295,15 @@ export const AppMenu = defineComponent({
       >
         {this.menus.map(item => {
           if (item.children?.length > 0) {
-            return renderSubmenu(true, item, this.collapseChange, this.ns);
+            return renderSubmenu(
+              true,
+              item,
+              this.collapseChange,
+              this.ns,
+              this.c,
+            );
           }
-          return renderMenuItem(item, this.collapseChange, this.ns);
+          return renderMenuItem(item, this.collapseChange, this.ns, this.c);
         })}
       </i-menu>
     );

app_Web/src/components/widgets/grid-control/grid-edit-item/grid-edit-item.tsx

@@ -40,7 +40,7 @@ export const GridEditItem = defineComponent({
         {this.controller.editorProvider &&
           h(this.controller.editorProvider.rowEditor, {
             props: {
-              value: this.row.errors[codeName],
+              value: this.row.data[codeName],
               data: this.row.data,
               controller: this.controller.editor,
               disable: this.row.editItemState[codeName]!.disabled,

app_Web/src/guard/auth-guard/auth-guard.ts

@@ -31,6 +31,14 @@ async function loadAppData(): Promise<void> {
   const res = await ibiz.net.get('/appdata');
   if (res.ok) {
     ibiz.appData = res.data;
+
+    // 设置权限服务需要的appData里的数据
+    if (ibiz.appData.unires) {
+      ibiz.authority.setResCodes(ibiz.appData.unires);
+    }
+    if (ibiz.appData.appmenu) {
+      ibiz.authority.setRtMenuCodes(ibiz.appData.appmenu);
+    }
   }
 }
 

app_Web/src/guard/unauthorized-handler/unauthorized-handler.ts

 import qs from 'qs';
-import { UrlHelper } from '@ibiz-template/core';
+import { LoginMode, RuntimeError, UrlHelper } from '@ibiz-template/core';
 import router from '@/router';
 
 /**
@@ -21,6 +21,9 @@ export class UnauthorizedHandler {
    * @returns {*}  {Promise<void>}
    */
   protected static async casLogin(): Promise<void> {
+    if (!ibiz.env.casLoginUrl) {
+      throw new RuntimeError('找不到环境参数casLoginUrl');
+    }
     // 登录后返回来的登录的地址
     const backUrl = `${UrlHelper.appBase}/cas-login.html${qs.stringify(
       {
@@ -66,7 +69,7 @@ export class UnauthorizedHandler {
    * @returns {*}  {Promise<void>}
    */
   static async handle(): Promise<void> {
-    if (ibiz.env.casLoginUrl) {
+    if (ibiz.env.loginMode === LoginMode.CAS) {
       await this.casLogin();
     } else {
       this.normalLogin();

app_Web/src/styles/components/views/404-view/404-view.scss

@@ -9,4 +9,9 @@
       margin-bottom: 20px;
     }
   }
+
+  @include when(top) {
+    width: 100vw;
+    height: 100vh;
+  }
 }

app_Web/src/styles/components/widgets/app-menu/app-menu.scss

@@ -78,6 +78,7 @@
   }
 
   // 菜单默认样式 覆盖iview自带，自带给的900会高于模态等
+  &.ivu-menu,
   .ivu-menu {
     z-index: 5;
   }
@@ -89,7 +90,7 @@
   }
 
   // 未收缩菜单项激活样式 覆盖iview自带
-  .ivu-menu-light.ivu-menu-vertical
+  &.ivu-menu-light.ivu-menu-vertical
     .ivu-menu-item-active:not(.ivu-menu-submenu) {
     @include menu-item-selected-style;
   }

app_Web/src/styles/settings/var.scss

@@ -277,8 +277,8 @@ $skeleton: map.merge(
   (
     'bg-color': rgb(190 190 190 / 20%),
     // 骨架屏元素背景颜色
-    'transition-color': rgb(129 129 129 / 24%)
-      // 骨架屏元素动画效果过渡颜色,,,,,,,,,,,,,,
+    'transition-color': rgb(129 129 129 / 24%),
+    // 骨架屏元素动画效果过渡颜色
   ),
   $skeleton
 );
@@ -370,14 +370,14 @@ $wf-toolbar: map.merge(
 $app-menu: () !default;
 $app-menu: map.merge(
   (
-    'item-selected-color': #2d8cf0,
+    'item-selected-color': getCssVar('color', 'primary'),
     'item-selected-bg-color': #f0faff,
-    'item-hover-color': #2d8cf0,
+    'item-hover-color': getCssVar('color', 'primary'),
     'item-padding': 14px 24px,
     'item-font-size': 14px,
     'item-height': 52px,
     'item-color': #515a6e,
-    'collapse-item-hover-color': #2d8cf0,
+    'collapse-item-hover-color': getCssVar('color', 'primary'),
     'collapse-item-padding': 14px 24px,
     'icon-width': 20px,
     'icon-height': 20px,
@@ -586,11 +586,11 @@ $view-layout-embed-header: () !default;
 $view-layout-embed-header: map.merge(
   (
     'padding': 8px,
-    'height': 38px,
-    'line-height': 21px,
+    'height': 48px,
+    'line-height': 31px,
     'caption-font-size': getCssVar('font-size', 'base'),
     'caption-color': getCssVar('text-color', 'primary'),
-    'content-height': 21px,
+    'content-height': 31px,
   ),
   $view-layout-embed-header
 );
@@ -650,8 +650,8 @@ $grid-ua-column: () !default;
 $grid-ua-column: map.merge(
   (
     'btn-bg-color': transparent,
-    'btn-hover-color': #2d8cf0,
-    'btn-color': #515a6e,
+    'btn-hover-color': getCssVar('color', 'primary', 'light-3'),
+    'btn-color': getCssVar('color', 'primary'),
   ),
   $grid-ua-column
 );
@@ -706,7 +706,7 @@ $mpickup-view-right: map.merge(
     'bg-color': #fff,
     'item-padding': 10px,
     'item-border-bottom': 1px solid #e8eaec,
-    'item-selected-bg-color': #2d8cf0,
+    'item-selected-bg-color': getCssVar('color', 'primary'),
     'item-selected-color': #fff,
   ),
   $mpickup-view-right
@@ -718,7 +718,7 @@ $mpickup-view-footer: map.merge(
     'padding': 12px 16px,
     'border-top': 1px solid #e8eaec,
     'btn-margin': 0 0 0 10px,
-    'confirm-btn-bg-color': #2e8cf0,
+    'confirm-btn-bg-color': getCssVar('color', 'primary'),
     'confirm-btn-color': #fff,
   ),
   $mpickup-view-footer
@@ -733,7 +733,7 @@ $opt-view-footer: map.merge(
     'padding': 12px 16px,
     'border-top': 1px solid #e8eaec,
     'btn-margin': 0 0 0 10px,
-    'confirm-btn-bg-color': #2e8cf0,
+    'confirm-btn-bg-color': getCssVar('color', 'primary'),
     'confirm-btn-color': #fff,
   ),
   $opt-view-footer
@@ -768,7 +768,7 @@ $search-form-buttons: map.merge(
   (
     'padding': 0 16px 16px,
     'btn-margin': 0 0 0 10px,
-    'search-btn-bg-color': #2e8cf0,
+    'search-btn-bg-color': getCssVar('color', 'primary'),
     'search-btn-color': #fff,
   ),
   $search-form-buttons
@@ -783,7 +783,7 @@ $wf-dyna-start-view-footer: map.merge(
     'padding': 12px 16px,
     'border-top': 1px solid #e8eaec,
     'btn-margin': 0 0 0 10px,
-    'confirm-btn-bg-color': #2e8cf0,
+    'confirm-btn-bg-color': getCssVar('color', 'primary'),
     'confirm-btn-color': #fff,
   ),
   $wf-dyna-start-view-footer
@@ -798,7 +798,7 @@ $wf-dyna-action-view-footer: map.merge(
     'padding': 12px 16px,
     'border-top': 1px solid #e8eaec,
     'btn-margin': 0 0 0 10px,
-    'confirm-btn-bg-color': #2e8cf0,
+    'confirm-btn-bg-color': getCssVar('color', 'primary'),
     'confirm-btn-color': #fff,
   ),
   $wf-dyna-action-view-footer
@@ -840,7 +840,7 @@ $wf-version-select-buttons: map.merge(
     'padding': 12px 0,
     'border-top': 1px solid #e8eaec,
     'btn-margin': 0 0 0 10px,
-    'confirm-btn-bg-color': #2e8cf0,
+    'confirm-btn-bg-color': getCssVar('color', 'primary'),
     'confirm-btn-color': #fff,
   ),
   $wf-version-select-buttons

app_Web/src/util/error-handler/error-handler.ts

@@ -36,6 +36,7 @@ export class ErrorHandler {
       }
     } else if (err instanceof RuntimeError) {
       ibiz.message.error(err.message);
+      console.error(err);
     } else {
       console.error(err);
     }

app_Web/src/views/404-view/404-view.tsx

@@ -22,21 +22,21 @@ export default defineComponent({
       }, 300);
     });
 
-    const isView1 = computed(() => {
+    const isTop = computed(() => {
       return !route.params.view1;
     });
 
-    return { ns, isView1, gotoIndexView };
+    return { ns, isTop, gotoIndexView };
   },
   render() {
     return (
-      <div class={this.ns.b()}>
+      <div class={[this.ns.b(), this.ns.is('top', this.isTop)]}>
         <img class={this.ns.b('img')} src='./assets/img/404.png' />
         <div class={this.ns.b('text')}>
           <div class={this.ns.be('text', 'text1')}>
             抱歉，您访问的页面不存在！
           </div>
-          {this.isView1 ? (
+          {this.isTop ? (
             <div class={this.ns.be('text', 'text2')}>
               您要找的页面不存在，请返回
               <a on-click={this.gotoIndexView}>首页</a>

app_Web/yarn.lock

@@ -490,47 +490,47 @@
   resolved "https://registry.yarnpkg.com/@ibiz-template/command/-/command-0.0.1-alpha.13.tgz#e8f07fede7fbfd3aa22eeec80ad66acf6c914d1e"
   integrity sha512-IUD6x29nmmxdL8XbGGfBAEYlPO/+E8qHd/TI2ncgaaBFcF6M4ih7xga8l1oYuSdr+xx4mlXkAbzQFOqAQWm21g==
 
-"@ibiz-template/controller@0.0.1-alpha.16":
-  version "0.0.1-alpha.16"
-  resolved "https://registry.yarnpkg.com/@ibiz-template/controller/-/controller-0.0.1-alpha.16.tgz#74399a69bcda3edad17a101bad1ea05e193b1f83"
-  integrity sha512-6ES/q892/Gm+TKKOH519PV3JyBpCQMP5Hpk/qO2iYdFC5GZJFSLbD/tz9IO8YcIPA32u4bkV8otxiV7q/S+L7A==
+"@ibiz-template/controller@0.0.1-alpha.17":
+  version "0.0.1-alpha.17"
+  resolved "https://registry.yarnpkg.com/@ibiz-template/controller/-/controller-0.0.1-alpha.17.tgz#7b77b93a4dc47056e7156307369337f9769ef42c"
+  integrity sha512-Ux9mDMNe7MQP4nb0f2P1gKFEakUiSQHeRdGHiwXY6TvW3v3cgaUAGrMhzk4KmCKPh5ePaZ0Yn6bUZ3i1zofztg==
   dependencies:
     async-validator "^4.2.5"
     dayjs "^1.11.5"
 
-"@ibiz-template/core@0.0.1-alpha.16":
-  version "0.0.1-alpha.16"
-  resolved "https://registry.yarnpkg.com/@ibiz-template/core/-/core-0.0.1-alpha.16.tgz#d75a6cbf368ecfb7fbcf3ffd83d33e75b5ddd763"
-  integrity sha512-Wt1J6hUmMopF9MfXj2tMTFoNiNnhYsEL78Jjmj4f2ZPVZd5+EDBk4ricGfw5aNNB74TPoqrX/vvpIVGEAlngGA==
+"@ibiz-template/core@0.0.1-alpha.17":
+  version "0.0.1-alpha.17"
+  resolved "https://registry.yarnpkg.com/@ibiz-template/core/-/core-0.0.1-alpha.17.tgz#928124edeb82cf056eb58d1c585fe77d5d15a795"
+  integrity sha512-jicy/kMM+A92+kbai7JEPt5+O4hyiCkRVahTe5dx3/bxOLQntvd0rwDUUPidQ1N1GYkcZzTC/6V7hG/x5imCSw==
   dependencies:
     axios "^0.27.2"
     pluralize "^8.0.0"
     qs "^6.11.0"
 
-"@ibiz-template/model@0.0.1-alpha.16":
-  version "0.0.1-alpha.16"
-  resolved "https://registry.yarnpkg.com/@ibiz-template/model/-/model-0.0.1-alpha.16.tgz#ad70fbb16ceeda471da5c98cc69c921279a6346f"
-  integrity sha512-QlrUeXkU9UaN6A/k2v9ElGw0n8lzD8pS/OFbc5SFcyXj9iTdKQk/wWk4qVRXKWhDOCzhAixTwxn7k+Z3bLtPAA==
+"@ibiz-template/model@0.0.1-alpha.17":
+  version "0.0.1-alpha.17"
+  resolved "https://registry.yarnpkg.com/@ibiz-template/model/-/model-0.0.1-alpha.17.tgz#9d5516eff2c0598b91bd9ada974ae9510ddb5304"
+  integrity sha512-CSwdXtHs/HyPKOL2hWMhMakl+zvj3kjHnuCvWk445iEl9UpaSzohpQFWJhxhlZrWJf5hHWP8wqaqTRBGEcVXjQ==
   dependencies:
     "@ibiz/dynamic-model-api" "^2.0.5"
     pluralize "^8.0.0"
 
-"@ibiz-template/runtime@0.0.1-alpha.16":
-  version "0.0.1-alpha.16"
-  resolved "https://registry.yarnpkg.com/@ibiz-template/runtime/-/runtime-0.0.1-alpha.16.tgz#8a17272a4f415215dad181b602555c62260b948e"
-  integrity sha512-it9CF4XEUEY5hWeiHwnMw3tW3v3IK7fxiWmRJADItUn5fs+rZnzfh/6pOKY2duj2o1yUnUzbSFrjw8owOOhx8Q==
+"@ibiz-template/runtime@0.0.1-alpha.17":
+  version "0.0.1-alpha.17"
+  resolved "https://registry.yarnpkg.com/@ibiz-template/runtime/-/runtime-0.0.1-alpha.17.tgz#49d149df2ba6565d244449bc3726394e691cf587"
+  integrity sha512-YuhTXOIahC7oXURULX//0oz4gHtcRvr8FyKbxpRy1N6fM+9SsX2p/NN6Uqn3gnmEGrVNsnngOsYF58HNxq14Kw==
   dependencies:
     "@ibiz-template/command" "^0.0.1-alpha.13"
 
-"@ibiz-template/service@0.0.1-alpha.16":
-  version "0.0.1-alpha.16"
-  resolved "https://registry.yarnpkg.com/@ibiz-template/service/-/service-0.0.1-alpha.16.tgz#4217b273f9a068caf573dffbb8abc873c9faae15"
-  integrity sha512-GJSk3lnvRYbylq8/di9MG6nPhVSaAR7S2GRInF0Uzj0mpqOVDr61YkdTBIvtCn1nZTSuXlu5NbfBxAhLmBaN1w==
+"@ibiz-template/service@0.0.1-alpha.17":
+  version "0.0.1-alpha.17"
+  resolved "https://registry.yarnpkg.com/@ibiz-template/service/-/service-0.0.1-alpha.17.tgz#3688e478200b690a2fe4c9d15dc6364a47aa0ba2"
+  integrity sha512-1heznFO8r9PskHoGVydFoNjAjYXeyoS8Amik0HPNkufV+SuGal56XC+Lp2Kv7J8XQd0yv8cfStKNl9oT/iFb3g==
 
-"@ibiz-template/vue-util@0.0.1-alpha.16":
-  version "0.0.1-alpha.16"
-  resolved "https://registry.yarnpkg.com/@ibiz-template/vue-util/-/vue-util-0.0.1-alpha.16.tgz#11965e9726d7e76b62e3c1764ed348f6faf723db"
-  integrity sha512-xxtPlFhfyOXrH6k1rgGVNuVm9NEM96JR06Tly9cbxp4bdldsbO6+tRzk9n6DDcsbyrSacnIkUy6rHm2gXKvOPg==
+"@ibiz-template/vue-util@0.0.1-alpha.17":
+  version "0.0.1-alpha.17"
+  resolved "https://registry.yarnpkg.com/@ibiz-template/vue-util/-/vue-util-0.0.1-alpha.17.tgz#46fdcc490d77e4bfaed90aab941ea711a22fef17"
+  integrity sha512-y50eRerVgusPgLnXlYfEN3Hd2aMCuTtgujzHceU+x7wDsPYElm789EdN0cs/9vceOm0PgxdBEUDkG126Oyr9yA==
 
 "@ibiz/dynamic-model-api@^2.0.5":
   version "2.0.5"

trainsys-core/src/main/resources/liquibase/h2_table.xml

@@ -50,7 +50,7 @@
     </changeSet>
 
     <!--输出实体[BOOK]数据结构 -->
-    <changeSet author="root" id="tab-book-271-3">
+    <changeSet author="root" id="tab-book-273-3">
         <createTable tableName="T_BOOK">
                 <column name="BOOKNAME" remarks="" type="VARCHAR(200)">
                 </column>