tony001 发布系统代码 [TrainSys，Mob]

app_Mob/CHANGELOG.md

@@ -6,6 +6,28 @@
 并且此项目遵循 [Semantic Versioning](https://semver.org/lang/zh-CN/).
 
 ## [Unreleased]
+## [0.0.2] - 2023-11-12
+### Fixed
+
+- 修复表单重复器值规则无效
+- 操作视图底部容器显示逻辑始终为true
+- 数值选择器支持精度
+- 工作流预制按钮 & 工作流按钮布局模式调整
+- 样式调整
+- 表单项支持动态标题
+- 搜索栏支持搜索项占位
+- 多数据部件支持项布局面板 & 优化触底加载文本
+- 首页布局导航占位迁移
+- 通用组件迁移
+
+### Added
+
+- 表单重复器按钮支持模型配置
+- 新增日历视&图表视图
+- 新增已支持部件视图
+- 多数据视图打开工作流视图识别param09
+- 编辑视图、多数据视图、分页导航视图、日历视图、图表石头部件视图支持
+- 视图消息支持自定义按钮文本 `userTag`
 
 ## [0.0.1] - 2023-11-01
 

app_Mob/package.json

 {
   "name": "test-ionic",
   "private": true,
-  "version": "0.0.1",
+  "version": "0.0.2",
   "description": "An Ionic project",
   "scripts": {
     "dev": "vite",
@@ -11,13 +11,13 @@
   },
   "dependencies": {
     "@ibiz-template-package/vs-tree-ex": "^0.1.1",
-    "@ibiz-template/core": "0.2.6",
-    "@ibiz-template/mob-theme": "^0.2.6",
-    "@ibiz-template/mob-vue3-components": "0.0.1-alpha.17",
-    "@ibiz-template/model-helper": "0.2.9",
-    "@ibiz-template/runtime": "0.2.9",
-    "@ibiz-template/theme": "0.2.0",
-    "@ibiz-template/vue3-util": "0.2.9",
+    "@ibiz-template/core": "0.2.15",
+    "@ibiz-template/mob-theme": "^0.2.7",
+    "@ibiz-template/mob-vue3-components": "0.0.1-alpha.18",
+    "@ibiz-template/model-helper": "0.2.16",
+    "@ibiz-template/runtime": "0.2.16",
+    "@ibiz-template/theme": "0.2.13",
+    "@ibiz-template/vue3-util": "0.2.16",
     "@ibiz/model-core": "^0.0.20",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.10",
@@ -29,7 +29,7 @@
     "qx-util": "^0.4.8",
     "ramda": "^0.29.1",
     "vant": "^4.7.2",
-    "vue": "^3.3.6",
+    "vue": "^3.3.8",
     "vue-i18n": "^9.5.0",
     "vue-router": "^4.2.5"
   },

app_Mob/public/extras/json/system-import.json

@@ -32,6 +32,7 @@
   "styles": {
     "@ibiz-template-package/vs-tree-ex": "../js/@ibiz-template-package/vs-tree-ex/0.1.1/vs-tree.css",
     "cherry-markdown": "../js/cherry-markdown/0.8.26/cherry-markdown.min.css",
+    "@ibiz-template/vue3-util": "../js/@ibiz-template/vue3-util/index.min.css",
     "@ibiz-template/mob-vue3-components": "../js/@ibiz-template/mob-vue3-components/index.min.css"
   }
 }

app_Mob/src/App.tsx

-import {
-  useViewStack,
-  routerCallback,
-} from '@ibiz-template/mob-vue3-components';
+import { useViewStack } from '@ibiz-template/mob-vue3-components';
+import { routerCallback } from '@ibiz-template/vue3-util';
 import { Modal, ViewMode } from '@ibiz-template/runtime';
 import { defineComponent, onUnmounted, ref } from 'vue';
 import './App.scss';

app_Mob/src/create-vue-app.ts

-import { App, Component, createApp } from 'vue';
+import { App, Component, createApp, KeepAlive } from 'vue';
 import MobVue3Components, {
   i18n,
   loadingDirective,
-  piniaInstance,
 } from '@ibiz-template/mob-vue3-components';
 import Vant, { allowMultipleToast } from 'vant';
+import { piniaInstance } from '@ibiz-template/vue3-util';
 import UserRegister from './user-register';
 
 // 允许同时存在多个 toast
@@ -25,6 +25,9 @@ export function createVueApp(
   rootProps?: IData,
 ): App<Element> {
   const app = createApp(rootComponent, rootProps);
+
+  app.component('KeepAlive', KeepAlive);
+
   // 全局 Vue 异常处理
   app.config.errorHandler = function (err: unknown): void {
     ibiz.util.error.handle(err);

app_Mob/src/main.ts

@@ -7,10 +7,9 @@ import {
   ModalUtil,
   NotificationUtil,
   OpenViewUtil,
-  OverlayContainer,
   OverlayController,
 } from '@ibiz-template/mob-vue3-components';
-import { PluginFactory } from '@ibiz-template/vue3-util';
+import { OverlayContainer, PluginFactory } from '@ibiz-template/vue3-util';
 import App from './App';
 import { attachEnvironmentConfig } from './attach-environment-config';
 import { createVueApp } from './create-vue-app';

app_Mob/src/router/index.ts

 import { Router, createRouter, createWebHashHistory } from 'vue-router';
 import {
-  AppRedirectView,
   View404,
   LoginView,
   useViewStack,
 } from '@ibiz-template/mob-vue3-components';
 import { Modal, ViewMode } from '@ibiz-template/runtime';
 import { isNilOrEmpty } from 'qx-util';
+import { AppRedirectView } from '@ibiz-template/vue3-util';
 import { AuthGuard } from '../guard';
 import { RouterShell, HomeView } from '@/components';
 

app_Mob/vite-plugins/ibiz-vite-plugin.ts

@@ -16,9 +16,9 @@ function IBizVitePlugin(): Plugin[] {
     apply: 'build',
     closeBundle() {
       // 模板底包
-      const templatePackages = ['core', 'runtime', 'vue3-util', 'model-helper'];
+      const templatePackages = ['core', 'runtime', 'model-helper'];
       // 组件底包
-      const componentPackages = ['mob-vue3-components'];
+      const componentPackages = ['vue3-util', 'mob-vue3-components'];
       const cwd = process.cwd();
       const baseModule = join(cwd, 'node_modules/@ibiz-template');
       const baseOutModule = join(cwd, 'dist/extras/js/@ibiz-template');
@@ -127,6 +127,19 @@ function IBizVitePlugin(): Plugin[] {
   const devP: Plugin = {
     name: 'iBizSys:System:Dev',
     apply: 'serve',
+    configResolved() {
+      const baseModule = resolve(__dirname, '../node_modules');
+      if (!existsSync(baseModule)) {
+        return;
+      }
+      // vue/runtime-core 包有扩展修改，开发态拷贝到 node_modules 避免功能缺失
+      const cpDir = join(__dirname, 'extras/@vue/runtime-core/3.3.4/**');
+      const outDir = join(
+        baseModule,
+        '.pnpm/@vue+runtime-core@3.3.4/node_modules/@vue/runtime-core/dist',
+      );
+      cpy(cpDir, outDir);
+    },
     transformIndexHtml(html) {
       const tags: HtmlTagDescriptor[] = [];
       const extraPath = resolve(__dirname, '../public/extras');

app_Mob/vite.config.ts

@@ -50,6 +50,7 @@ export default defineConfig({
       'vant',
       'vue',
       'vue-i18n',
+      'vue3-hash-calendar',
       'vue-router',
     ],
   },

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json

@@ -1481,16 +1481,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   }, {

trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Web/PSSYSAPP.json

@@ -11877,16 +11877,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     }, {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     } ]
   }, {
@@ -11921,16 +11921,16 @@
         "id" : "ViewMsg4"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       }
     } ]
   }, {
@@ -11947,10 +11947,10 @@
     "codeName" : "VMGroup4",
     "name" : "视图消息位置测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
       }
     }, {
       "name" : "消息位置-视图上方",
@@ -11959,10 +11959,10 @@
         "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
       }
     }, {
       "name" : "消息位置-视图下方",
@@ -11975,6 +11975,20 @@
     "codeName" : "VMGroup8",
     "name" : "【静态测试】",
     "getPSAppViewMsgGroupDetails" : [ {
+      "name" : "消息类型-错误信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
+    }, {
+      "name" : "消息类型-警告信息",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg5"
+      },
+      "position" : "POPUP"
+    }, {
       "name" : "关闭模式-无删除-上方-常规",
       "getPSAppViewMsg" : {
         "modelref" : true,
@@ -11987,12 +12001,6 @@
         "id" : "ViewMsg4"
       },
       "position" : "POPUP"
-    }, {
-      "name" : "关闭模式-默认删除-上方-错误",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg12"
-      }
     }, {
       "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
@@ -12000,10 +12008,10 @@
         "id" : "ViewMsg9"
       }
     }, {
-      "name" : "消息位置-视图下方",
+      "name" : "关闭模式-默认删除-上方-错误",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg8"
+        "id" : "ViewMsg12"
       }
     }, {
       "name" : "关闭模式-本次删除-上方-警告",
@@ -12012,19 +12020,11 @@
         "id" : "ViewMsg13"
       }
     }, {
-      "name" : "消息类型-警告信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg5"
-      },
-      "position" : "POPUP"
-    }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
+        "id" : "ViewMsg8"
+      }
     } ]
   }, {
     "codeName" : "VMGroup5",
@@ -12036,32 +12036,32 @@
         "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
       }
     } ]
   }, {
     "codeName" : "VMGroup6",
     "name" : "视图消息动态模式测试",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "动态模式-静态内容",
+      "name" : "动态模式-实体数据集",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg15"
+        "id" : "ViewMsg14"
       }
     }, {
-      "name" : "动态模式-实体数据集",
+      "name" : "动态模式-静态内容",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg14"
+        "id" : "ViewMsg15"
       }
     } ]
   } ],