tony001 部署微服务应用 [TrainSys，Mob]

app_Mob/CHANGELOG.md

@@ -7,6 +7,86 @@
 
 ## [Unreleased]
 
+## [0.0.6] - 2023-12-20
+
+### Fixed
+
+- 修复工作流视图在可编辑模式下操作后未调用保存
+- 修复返回顶部重复绘制
+- 修复编辑器出现异常下划线（vant样式污染）
+
+### Added
+
+- 新增预制头部组件 & 视图头部返回代码抽离
+- mpicker 支持下拉
+- 新增数据多选通用组件
+
+### Change
+
+- 菜单样式组件抽离
+- span组件同步
+- 门户菜单部件绘制调整
+- 表单成员基础功能支持
+
+## [0.0.5] - 2023-12-14
+
+### Change
+
+- 流程撤回调用方式调整
+- 优化表单项border过粗
+- 重复器布局结构 & 样式调整
+- 表单多数据部件样式更新
+
+### Fixed
+
+- 修复span未居中
+
+## [0.0.4] - 2023-12-12
+
+### Fixed
+
+- 修正文本框字体大小异常
+- 修复标题未居中
+- 修复数据看板无法滚动
+- 修复多次选中下回显值异常
+- 修复图片上传预览 上传多张图片预览时总是打开第一张
+
+### Added
+
+- 文件上传适配安卓平台
+- 支持动态轮播图 和 轮播图
+- 支持视频播放
+- 图片上传支持预览
+- 支持面板用户信息
+- 日历视图支持点击数据查询，日历标记逻辑优化
+- 统一适配搭载平台返回事件
+- 支持日历项无数据绘制
+- 表单项容器新增禁用态class 和 只读项class
+
+### Change
+
+- 优化多选样式，优化操作
+- 优化默认日历项样式
+- 优化多数据项激活背景色
+
+## [0.0.3] - 2023-12-07
+
+### Fixed
+
+- 修复多项文件上传成功后无法回显
+- 修复多选视图布局占位异常
+
+### Change
+
+- 优化文件上传样式
+
+- 优化应用模型加载
+- 默认主题加载变更为未配置扩展主题包时才加载
+
+### Added
+
+- 适配多应用模式
+
 ## [0.0.2] - 2023-12-06
 
 ### Added

app_Mob/package.json

 {
   "name": "@ibiz-template/next-mob",
   "private": true,
-  "version": "0.0.2",
+  "version": "0.0.6",
   "description": "An Ionic project",
   "scripts": {
     "dev": "vite",
@@ -11,14 +11,14 @@
   },
   "dependencies": {
     "@ibiz-template-package/vs-tree-ex": "^0.1.1",
-    "@ibiz-template/core": "^0.4.5",
-    "@ibiz-template/mob-theme": "^0.2.9",
-    "@ibiz-template/mob-vue3-components": "^0.0.2",
-    "@ibiz-template/model-helper": "^0.4.5",
-    "@ibiz-template/runtime": "^0.4.5",
+    "@ibiz-template/mob-theme": "^0.2.11",
+    "@ibiz-template/mob-vue3-components": "^0.0.6",
+    "@ibiz-template/core": "^0.4.12",
+    "@ibiz-template/model-helper": "^0.4.13",
+    "@ibiz-template/runtime": "^0.4.13",
     "@ibiz-template/theme": "^0.4.0",
-    "@ibiz-template/vue3-util": "^0.4.5",
-    "@ibiz/model-core": "^0.0.26",
+    "@ibiz-template/vue3-util": "^0.4.13",
+    "@ibiz/model-core": "^0.0.27",
     "async-validator": "^4.2.5",
     "dayjs": "^1.11.10",
     "echarts": "^5.4.3",

app_Mob/public/assets/img/file/audio.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>9 （48*48）</title>
+    <g id="9-（48*48）" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#08C69C" x="0" y="0" width="48" height="48" rx="4"></rect>
+        <g id="music" transform="translate(8, 8)" fill="#FFFFFF" fill-rule="nonzero">
+            <rect id="矩形" opacity="0" x="0" y="0" width="32" height="32"></rect>
+            <path d="M28.0535625,5.453125 L28.0535625,23.03125 C28.0535625,23.5543958 27.8756771,24.02 27.5199062,24.4280625 C27.1641354,24.836125 26.7142188,25.152625 26.1701562,25.3775625 C25.6260938,25.6025 25.0846146,25.7699167 24.5457187,25.8798125 C24.0068229,25.9897083 23.5019688,26.0446354 23.0311563,26.0445938 C22.5603438,26.0445521 22.0554896,25.989625 21.5165937,25.8798125 C20.9776979,25.77 20.4362188,25.6025833 19.8921563,25.3775625 C19.3480938,25.1525417 18.8981771,24.8360417 18.5424063,24.4280625 C18.1866354,24.0200833 18.00875,23.5544792 18.00875,23.03125 C18.00875,22.5080208 18.1866354,22.0424167 18.5424062,21.6344375 C18.8981771,21.2264583 19.3480938,20.9099583 19.8921562,20.6849375 C20.4362187,20.4599167 20.9776979,20.2925 21.5165937,20.1826875 C22.0554896,20.072875 22.5603438,20.0179479 23.0311562,20.0179062 C24.1297813,20.0179062 25.1342396,20.2219375 26.0445312,20.63 L26.0445312,12.2019375 L13.9909687,15.921625 L13.9909687,27.0492188 C13.9909687,27.5723646 13.8130833,28.0379688 13.4573125,28.4460313 C13.1015417,28.8540938 12.6516146,29.1705938 12.1075312,29.3955313 C11.5634479,29.6204688 11.0219687,29.7878854 10.4830937,29.8977813 C9.94421875,30.0076771 9.43936458,30.0625625 8.96853125,30.0625625 C8.49769792,30.0625625 7.99284375,30.0075938 7.45396875,29.8977813 C6.91509375,29.7879688 6.37361458,29.6205521 5.82953125,29.3955313 C5.28544792,29.1705104 4.83552083,28.8540104 4.47975,28.4460313 C4.12397917,28.0380521 3.94609375,27.5724479 3.94609375,27.0492188 C3.94609375,26.5259896 4.12397917,26.0603854 4.47975,25.6524063 C4.83552083,25.2444271 5.28544792,24.9279271 5.82953125,24.7029063 C6.37361458,24.4778854 6.91509375,24.3104688 7.45396875,24.2006563 C7.99284375,24.0908438 8.49769792,24.0359167 8.96853125,24.035875 C10.0671562,24.035875 11.0716146,24.2399062 11.9819062,24.6479688 L11.9819062,9.47115625 C11.9819062,9.14680208 12.0813021,8.85121875 12.2800937,8.58440625 C12.4788854,8.31759375 12.7352292,8.131875 13.049125,8.02725 L26.1071875,4.009375 C26.2327292,3.96752083 26.3792187,3.94659375 26.5466562,3.94659375 C26.9651771,3.94659375 27.3209167,4.09308333 27.613875,4.3860625 C27.9068333,4.67904167 28.0535625,5.03478125 28.0535625,5.45328125 L28.0535625,5.453125 Z" id="路径"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

app_Mob/public/assets/img/file/docx.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>5 （48*48）</title>
+    <g id="5-（48*48）" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#2E5EA6" x="0" y="0" width="48" height="48" rx="4"></rect>
+        <g id="detail-fill" transform="translate(8, 8)" fill-rule="nonzero">
+            <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="32" height="32"></rect>
+            <path d="M27.6027061,2 L4.60270615,2 C4.04958115,2 3.60270615,2.446875 3.60270615,3 L3.60270615,29 C3.60270615,29.553125 4.04958115,30 4.60270615,30 L27.6027061,30 C28.1558311,30 28.6027061,29.553125 28.6027061,29 L28.6027061,3 C28.6027061,2.446875 28.1558311,2 27.6027061,2 Z M22.4777061,18.75 C22.4777061,18.8875 22.3652061,19 22.2277061,19 L9.47770615,19 C9.34020615,19 9.22770615,18.8875 9.22770615,18.75 L9.22770615,17.25 C9.22770615,17.1125 9.34020615,17 9.47770615,17 L22.2277061,17 C22.3652061,17 22.4777061,17.1125 22.4777061,17.25 L22.4777061,18.75 Z M22.4777061,23.75 C22.4777061,23.8875 22.3652061,24 22.2277061,24 L9.47770615,24 C9.34020615,24 9.22770615,23.8875 9.22770615,23.75 L9.22770615,22.25 C9.22770615,22.1125 9.34020615,22 9.47770615,22 L22.2277061,22 C22.3652061,22 22.4777061,22.1125 22.4777061,22.25 L22.4777061,23.75 Z M22.4777061,14.25 C22.4777061,14.3875 22.3652061,14.5 22.2277061,14.5 L9.47770615,14.5 C9.34020615,14.5 9.22770615,14.3875 9.22770615,14.25 L9.22770615,12.75 C9.22770615,12.6125 9.34020615,12.5 9.47770615,12.5 L22.2277061,12.5 C22.3652061,12.5 22.4777061,12.6125 22.4777061,12.75 L22.4777061,14.25 Z M22.4777061,9.75 C22.4777061,9.8875 22.3652061,10 22.2277061,10 L9.47770615,10 C9.34020615,10 9.22770615,9.8875 9.22770615,9.75 L9.22770615,8.25 C9.22770615,8.1125 9.34020615,8 9.47770615,8 L22.2277061,8 C22.3652061,8 22.4777061,8.1125 22.4777061,8.25 L22.4777061,9.75 Z" id="形状" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

app_Mob/public/assets/img/file/excel.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>2 （48*48）</title>
+    <g id="2-（48*48）" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#00BC66" x="0" y="0" width="48" height="48" rx="4"></rect>
+        <g id="表单组件-表格" transform="translate(8, 8)" fill="#FFFFFF" fill-rule="nonzero">
+            <rect id="矩形" opacity="0" x="0" y="0" width="32" height="32"></rect>
+            <path d="M30,18.482 L30,11.53 C30,11.521 30.005,11.514 30.005,11.506 C30.005,11.498 30,11.49 30,11.482 L30,6 C30,5.44771525 29.5522847,5 29,5 L3,5 C2.44771525,5 2,5.44771525 2,6 L2,11.482 C2,11.491 1.995,11.498 1.995,11.506 C1.995,11.514 2,11.521 2,11.53 L2,18.482 C2,18.491 1.995,18.498 1.995,18.506 C1.995,18.514 2,18.521 2,18.53 L2,27 C2,27.5522847 2.44771525,28 3,28 L29,28 C29.5522847,28 30,27.5522847 30,27 L30,18.53 C30,18.521 30.005,18.514 30.005,18.506 C30.005,18.498 30,18.49 30,18.482 Z M12.5,17.506 L12.5,12.506 L19,12.506 L19,17.506 L12.5,17.506 Z M19,19.506 L19,26 L12.5,26 L12.5,19.506 L19,19.506 Z M4,12.506 L10.5,12.506 L10.5,17.506 L4,17.506 L4,12.506 Z M21,12.506 L28,12.506 L28,17.506 L21,17.506 L21,12.506 Z M28,7 L28,10.506 L4,10.506 L4,7 L28,7 Z M4,19.506 L10.5,19.506 L10.5,26 L4,26 L4,19.506 Z M21,26 L21,19.506 L28,19.506 L28,26 L21,26 Z" id="形状"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

app_Mob/public/assets/img/file/img.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>7 （48*48）</title>
+    <g id="7-（48*48）" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#4CB3C2" x="0" y="0" width="48" height="48" rx="4"></rect>
+        <g id="image-fill" transform="translate(8, 8)" fill-rule="nonzero">
+            <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="32" height="32"></rect>
+            <path d="M29,5 L3,5 C2.446875,5 2,5.446875 2,6 L2,26 C2,26.553125 2.446875,27 3,27 L29,27 C29.553125,27 30,26.553125 30,26 L30,6 C30,5.446875 29.553125,5 29,5 Z M10.5625,9.5 C11.665625,9.5 12.5625,10.396875 12.5625,11.5 C12.5625,12.603125 11.665625,13.5 10.5625,13.5 C9.459375,13.5 8.5625,12.603125 8.5625,11.5 C8.5625,10.396875 9.459375,9.5 10.5625,9.5 Z M26.621875,23.159375 C26.578125,23.196875 26.51875,23.21875 26.459375,23.21875 L5.5375,23.21875 C5.4,23.21875 5.2875,23.10625 5.2875,22.96875 C5.2875,22.909375 5.309375,22.853125 5.346875,22.80625 L10.66875,16.49375 C10.75625,16.3875 10.915625,16.375 11.021875,16.4625 C11.03125,16.471875 11.04375,16.48125 11.053125,16.49375 L14.159375,20.18125 L19.1,14.321875 C19.1875,14.215625 19.346875,14.203125 19.453125,14.290625 C19.4625,14.3 19.475,14.309375 19.484375,14.321875 L26.659375,22.809375 C26.740625,22.9125 26.728125,23.071875 26.621875,23.159375 Z" id="形状" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

app_Mob/public/assets/img/file/pdf.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>4 （48*48）</title>
+    <g id="4-（48*48）" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#EC5D78" x="0" y="0" width="48" height="48" rx="4"></rect>
+        <g id="pdf" transform="translate(8, 8)" fill-rule="nonzero">
+            <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="32" height="32"></rect>
+            <path d="M30.464,20.224 C29.568,19.264 27.776,18.72 25.216,18.72 C23.84,18.72 22.272,18.848 20.544,19.168 C19.584,18.208 18.592,17.088 17.664,15.776 C16.992,14.848 16.416,13.888 15.904,12.928 C16.928,9.76 17.408,7.2 17.408,5.344 C17.408,3.264 16.672,1.088 14.496,1.088 C13.824,1.088 13.184,1.504 12.832,2.08 C11.872,3.84 12.288,7.68 13.984,11.456 C13.344,13.344 12.704,15.168 11.872,17.184 C11.168,18.88 10.336,20.672 9.472,22.272 C4.608,24.256 1.472,26.56 1.184,28.352 C1.056,29.024 1.28,29.664 1.76,30.144 C1.92,30.272 2.56,30.816 3.616,30.816 C6.848,30.816 10.24,25.504 11.968,22.272 C13.28,21.824 14.624,21.408 15.936,21.024 C17.376,20.608 18.848,20.288 20.16,20.064 C23.552,23.168 26.56,23.68 28.064,23.68 C29.92,23.68 30.592,22.912 30.816,22.272 C31.168,21.472 30.912,20.576 30.496,20.096 L30.464,20.224 L30.464,20.224 Z M28.736,21.536 C28.608,22.208 27.936,22.656 27.008,22.656 C26.752,22.656 26.528,22.624 26.272,22.56 C24.576,22.144 23.008,21.28 21.408,19.936 C22.976,19.68 24.288,19.616 25.12,19.616 C26.048,19.616 26.848,19.648 27.36,19.808 C27.968,19.936 28.928,20.352 28.736,21.536 L28.736,21.536 Z M19.36,19.424 C18.208,19.648 16.992,19.936 15.712,20.288 C14.688,20.576 13.632,20.864 12.576,21.248 C13.152,20.128 13.632,19.04 14.08,18.016 C14.624,16.736 15.04,15.456 15.488,14.24 C15.936,15.008 16.416,15.776 16.896,16.448 C17.696,17.504 18.528,18.528 19.36,19.424 Z M13.568,2.624 C13.76,2.272 14.112,2.08 14.4,2.08 C15.328,2.08 15.488,3.168 15.488,4.032 C15.488,5.472 15.04,7.68 14.304,10.208 C13.024,6.688 12.928,3.776 13.568,2.624 L13.568,2.624 Z M8.736,23.648 C6.496,27.424 4.32,29.792 3.008,29.792 C2.752,29.792 2.528,29.696 2.336,29.568 C2.08,29.312 1.952,28.992 2.016,28.608 C2.272,27.264 4.8,25.376 8.736,23.648 Z" id="形状" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

app_Mob/public/assets/img/file/ppt.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>3 （48*48）</title>
+    <g id="3-（48*48）" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#F97759" x="0" y="0" width="48" height="48" rx="4"></rect>
+        <g id="pie-chart-circle-fil" transform="translate(8, 8)" fill-rule="nonzero">
+            <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="32" height="32"></rect>
+            <path d="M26.971875,16.203125 L15.796875,16.203125 L15.796875,5.028125 C15.796875,4.890625 15.684375,4.778125 15.546875,4.778125 L14.734375,4.778125 C13.05,4.778125 11.4125,5.109375 9.875,5.759375 C8.390625,6.3875 7.053125,7.2875 5.90625,8.434375 C4.759375,9.58125 3.859375,10.915625 3.23125,12.403125 C2.58125,13.94375 2.25,15.578125 2.25,17.265625 C2.25,18.953125 2.58125,20.584375 3.23125,22.125 C3.859375,23.609375 4.759375,24.946875 5.90625,26.09375 C7.053125,27.240625 8.3875,28.140625 9.875,28.76875 C11.415625,29.421875 13.053125,29.753125 14.7375,29.753125 C16.421875,29.753125 18.059375,29.421875 19.596875,28.771875 C21.08125,28.14375 22.41875,27.24375 23.565625,26.096875 C24.7125,24.95 25.6125,23.615625 26.240625,22.128125 C26.89375,20.5875 27.225,18.95 27.225,17.265625 L27.225,16.453125 C27.221875,16.315625 27.109375,16.203125 26.971875,16.203125 Z M29.71875,14.46875 L29.6375,13.5875 C29.371875,10.7125 28.096875,8 26.040625,5.953125 C23.9875,3.9 21.271875,2.628125 18.3875,2.3625 L17.503125,2.28125 C17.35625,2.26875 17.23125,2.38125 17.23125,2.528125 L17.23125,14.51875 C17.23125,14.65625 17.34375,14.76875 17.48125,14.76875 L29.46875,14.7375 C29.615625,14.734375 29.73125,14.6125 29.71875,14.46875 Z" id="形状" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

app_Mob/public/assets/img/file/text.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>1（48*48）</title>
+    <g id="1（48*48）" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#548DE4" x="0" y="0" width="48" height="48" rx="4"></rect>
+        <g id="file-text-fill" transform="translate(8, 8)" fill-rule="nonzero">
+            <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="32" height="32"></rect>
+            <path d="M26.70625,9.021875 C26.89375,9.209375 27,9.4625 27,9.728125 L27,29 C27,29.553125 26.553125,30 26,30 L6,30 C5.446875,30 5,29.553125 5,29 L5,3 C5,2.446875 5.446875,2 6,2 L19.271875,2 C19.5375,2 19.79375,2.10625 19.98125,2.29375 L26.70625,9.021875 Z M24.69375,10.1875 L18.8125,4.30625 L18.8125,10.1875 L24.69375,10.1875 Z M10,15.0625 C9.86192881,15.0625 9.75,15.1744288 9.75,15.3125 L9.75,16.8125 C9.75,16.9505712 9.86192881,17.0625 10,17.0625 L22,17.0625 C22.1380712,17.0625 22.25,16.9505712 22.25,16.8125 L22.25,15.3125 C22.25,15.1744288 22.1380712,15.0625 22,15.0625 L10,15.0625 Z M10,19.3125 C9.86192881,19.3125 9.75,19.4244288 9.75,19.5625 L9.75,21.0625 C9.75,21.2005712 9.86192881,21.3125 10,21.3125 L15.75,21.3125 C15.8880712,21.3125 16,21.2005712 16,21.0625 L16,19.5625 C16,19.4244288 15.8880712,19.3125 15.75,19.3125 L10,19.3125 Z" id="形状" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

app_Mob/public/assets/img/file/unknown.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>6 （48*48）</title>
+    <g id="6-（48*48）" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#708297" x="0" y="0" width="48" height="48" rx="4"></rect>
+        <g id="file-fill" transform="translate(8, 8)" fill-rule="nonzero">
+            <rect id="矩形" fill="#000000" opacity="0" x="0" y="0" width="32" height="32"></rect>
+            <path d="M26.70625,9.021875 C26.89375,9.209375 27,9.4625 27,9.728125 L27,29 C27,29.553125 26.553125,30 26,30 L6,30 C5.446875,30 5,29.553125 5,29 L5,3 C5,2.446875 5.446875,2 6,2 L19.271875,2 C19.5375,2 19.79375,2.10625 19.98125,2.29375 L26.70625,9.021875 Z M24.69375,10.1875 L18.8125,4.30625 L18.8125,10.1875 L24.69375,10.1875 Z" id="形状" fill="#FFFFFF"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

app_Mob/public/assets/img/file/video.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>10 （48*48）</title>
+    <g id="10-（48*48）" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#A071EA" x="0" y="0" width="48" height="48" rx="4"></rect>
+        <g id="video" transform="translate(8, 8)" fill="#FFFFFF" fill-rule="nonzero">
+            <rect id="矩形" opacity="0" x="0" y="0" width="32" height="32"></rect>
+            <path d="M28,9.53334375 C27.1718947,9.16048201 26.2011819,9.31789556 25.5333438,9.93334375 L22.6666562,12.6 L22.6666562,10.6666562 C22.6666562,8.45751725 20.8757952,6.66665625 18.6666562,6.66665625 L6.66665625,6.66665625 C4.45751725,6.66665625 2.66665625,8.45751725 2.66665625,10.6666562 L2.66665625,21.3333437 C2.66665625,23.5424827 4.45751725,25.3333437 6.66665625,25.3333437 L18.6666562,25.3333437 C20.8757952,25.3333437 22.6666562,23.5424827 22.6666562,21.3333437 L22.6666562,19.4 L25.5466562,22.0666562 C25.970644,22.4504553 26.5214513,22.6641277 27.0933438,22.6666562 C27.410716,22.6659172 27.7243084,22.597745 28.0133438,22.4666563 C28.8177355,22.1412529 29.3448907,21.3610593 29.3466563,20.4933438 L29.3466563,11.5066563 C29.3426985,10.6356527 28.8096319,9.85452757 28,9.53334375 Z" id="路径"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

app_Mob/public/assets/img/file/zip.svg

+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="48px" height="48px" viewBox="0 0 48 48" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>8 （48*48）</title>
+    <g id="8-（48*48）" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <rect id="矩形" fill="#558DCE" x="0" y="0" width="48" height="48" rx="4"></rect>
+        <g id="file-zip" transform="translate(8, 8)" fill="#FFFFFF" fill-rule="nonzero">
+            <rect id="矩形" opacity="0" x="0" y="0" width="32" height="32"></rect>
+            <path d="M14,12 L16,12 L16,14 L14,14 L14,12 Z M14,17.9375 L14,22.9375 L18,22.9375 L18,17.9375 L16,17.9375 L16,16 L14,16 L14,17.9375 Z M16.5,19.4375 L16.5,21.4375 L15.5,21.4375 L15.5,19.4375 L16.5,19.4375 Z M16,10 L18,10 L18,12 L16,12 L16,10 Z M14,8 L16,8 L16,10 L14,10 L14,8 Z M16,14 L18,14 L18,16 L16,16 L16,14 Z M16,6 L18,6 L18,8 L16,8 L16,6 Z M14,4 L16,4 L16,6 L14,6 L14,4 Z" id="形状"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file

app_Mob/src/App.tsx

@@ -6,7 +6,7 @@ import './App.scss';
 
 export default defineComponent({
   setup() {
-    const { viewStack, on, off, goBack } = useViewStack();
+    const { viewStack, on, off } = useViewStack();
     const transitionName = ref('forward');
     const onViewStackChange = (type: 'push' | 'pop') => {
       transitionName.value = type === 'push' ? 'forward' : 'back';
@@ -30,7 +30,7 @@ export default defineComponent({
             routeDepth: 1,
             dismiss: modal => {
               routerCallback.close(key, modal);
-              goBack();
+              ibiz.platform.back();
               viewModals.delete(key);
             },
           }),

app_Mob/src/create-vue-app.ts

@@ -32,9 +32,22 @@ export function createVueApp(
   app.config.errorHandler = function (err: unknown): void {
     ibiz.util.error.handle(err);
   };
+
+  // 模态等销毁的时候删除全局的app
+  if (rootProps) {
+    const oldUnMounted = rootProps.unmounted;
+    // eslint-disable-next-line no-param-reassign
+    rootProps.unmounted = (): void => {
+      oldUnMounted();
+      window.vueInstances.delete(app);
+    };
+  }
+
   app.use(i18n);
   app.use(Vant).use(piniaInstance).use(MobVue3Components).use(UserRegister);
 
+  window.vueInstances.set(app, app);
+
   ibiz.plugin.register(app);
   // loading指令
   app.directive('loading', loadingDirective);

app_Mob/src/guard/auth-guard/auth-guard.ts

@@ -3,6 +3,8 @@ import { getCookie, setCookie } from 'qx-util';
 import { ModelHelper } from '@ibiz-template/model-helper';
 import { i18n } from '@ibiz-template/mob-vue3-components';
 
+import { mergeDeepRight } from 'ramda';
+
 /**
  * 加载应用数据
  *
@@ -63,6 +65,23 @@ function setRefreshToken(): void {
   }
 }
 
+/**
+ * 加载主题插件
+ *
+ * @author chitanda
+ * @date 2023-12-03 01:12:38
+ * @protected
+ * @return {*}  {Promise<void>}
+ */
+async function loadTheme(): Promise<void> {
+  const app = ibiz.hub.getApp();
+  const uiThemes = app.model.appUIThemes || [];
+  if (uiThemes.length > 0) {
+    const theme = uiThemes[0];
+    await ibiz.util.theme.loadTheme(theme);
+  }
+}
+
 let helper: ModelHelper | undefined;
 
 /**
@@ -91,12 +110,9 @@ async function initModel(permission: boolean = true): Promise<void> {
       ibiz.env.appId,
       permission,
     );
-    await helper.initModelUtil(
-      ibiz.appData?.dynamodeltag || '',
-      ibiz.env.appId,
-    );
-    const app = await helper.getAppModel();
-    ibiz.env.isMob = app.mobileApp === true;
+    const app = await ibiz.hub.getAppAsync(ibiz.env.appId);
+    const appModel = app.model;
+    ibiz.env.isMob = appModel.mobileApp === true;
     if (ibiz.env.isEnableMultiLan) {
       const lang = ibiz.i18n.getLang();
       const m = await helper.getPSAppLang(lang.replace('-', '_').toUpperCase());
@@ -108,6 +124,48 @@ async function initModel(permission: boolean = true): Promise<void> {
       });
       i18n.global.mergeLocaleMessage(lang, data);
     }
+    if (!appModel.appUIThemes) {
+      const module = await import('@ibiz-template/mob-theme');
+      const theme = module.default || module;
+      window.vueInstances.forEach(inst => {
+        inst.use(theme);
+      });
+    } else {
+      await loadTheme();
+    }
+  }
+}
+
+/**
+ * 根据应用自定义参数解析成环境变量
+ *
+ * @author chitanda
+ * @date 2023-11-24 19:11:50
+ * @return {*}  {Promise<void>}
+ */
+async function initEnvironment(): Promise<void> {
+  if (helper) {
+    const app = await helper.getAppModel();
+    const userParam = app.userParam;
+    if (userParam) {
+      Object.keys(userParam).forEach(key => {
+        const value = ibiz.util.rawValue.format(userParam[key]);
+        const keys = key.split('.');
+        let currentObj = ibiz.env as IData;
+        for (let i = 0; i < keys.length; i++) {
+          const k = keys[i];
+          if (i === keys.length - 1) {
+            currentObj[k] = value;
+          } else {
+            currentObj[k] = currentObj[k] || {};
+            currentObj = currentObj[k];
+          }
+        }
+      });
+      if (ibiz.env.globalConfig) {
+        ibiz.config = mergeDeepRight(ibiz.config, ibiz.env.globalConfig);
+      }
+    }
   }
 }
 
@@ -124,6 +182,7 @@ async function appInit(): Promise<void> {
   }
   await loadAppData();
   await initModel();
+  await initEnvironment();
   setRefreshToken();
 }
 

app_Mob/src/index.d.ts

 import '@ibiz/model-core';
+declare global {
+  interface Window {
+    vueInstances: Map<App, App>;
+  }
+}
\ No newline at end of file

app_Mob/src/main.ts

 import { install as installCore } from '@ibiz-template/core';
-import { install as installRuntime } from '@ibiz-template/runtime';
-import { install as installDefaultViewLayout } from '@ibiz-template/mob-theme';
+import {
+  getPlatformProvider,
+  install as installRuntime,
+} from '@ibiz-template/runtime';
 import {
   LoadingUtil,
   MessageUtil,
@@ -18,6 +20,7 @@ import { AppRouter } from '@/router';
 import { UnauthorizedHandler } from './util';
 
 async function createApp(): Promise<void> {
+  window.vueInstances = new Map();
   OverlayContainer.createVueApp = createVueApp;
 
   installCore();
@@ -65,9 +68,7 @@ async function createApp(): Promise<void> {
   ibiz.loading = new LoadingUtil();
   ibiz.overlay = new OverlayController();
   ibiz.util.error.register(new UnauthorizedHandler());
-  installDefaultViewLayout((key, model) => {
-    ibiz.util.layoutPanel.register(key, model);
-  });
+  ibiz.platform = getPlatformProvider();
   await ibiz.i18n.init();
 
   app.mount('#app');

app_Mob/swarm.yaml

@@ -3,7 +3,7 @@ services:
   trainsys-app-mob:
     image: dstimage
     ports:
-      - "80:80"
+      - "50200:80"
     networks:
       - agent_network
     environment:

config.xml

@@ -55,12 +55,36 @@
 	  git clone -b master $para2 trainsys/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd trainsys/
-      mvn clean package -Ptrainsys
-      mvn install -Ptrainsys
-      cd trainsys-provider
-      mvn -Ptrainsys docker:build
-      mvn -Ptrainsys docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/trainsys-provider-trainsys.yaml ebsx --with-registry-auth      
+      mkdir -p /var/lib/jenkins/appcache/64777BB9-78E2-44DD-AEF6-FF87AC45C1D5
+      if [ -e app_Mob/.dynamic ]
+      then
+          cd app_Mob
+      else
+          cd app_Mob/app
+      fi
+      sed -i "s#dstimage#$para5#g" swarm.yaml      
+      if [[ $para3 = all ]];then
+          mv Dockerfile-ALL Dockerfile      
+          set +e
+          sed -i "s#/api#/sztrainsys__mob#g" src/environments/environment.ts  
+          sed -i "s#outputDir#//outputDir#g" vue.config.js 
+          set -e
+          yarn
+          ln -s /var/lib/jenkins/appcache/64777BB9-78E2-44DD-AEF6-FF87AC45C1D5 node_modules/.cache
+          yarn build
+      else
+          if [ -e .dynamic ]
+          then
+              mv  ../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob model
+          else
+              mv  ../../trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/Mob model
+          fi
+          sed -i "s#srcimagename#$para4#g" Dockerfile-MODEL
+          mv Dockerfile-MODEL Dockerfile
+      fi          
+      docker build -t $para5 .
+      docker push $para5
+      docker -H $para1 stack deploy --compose-file=swarm.yaml ebsx --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

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

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

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

@@ -12289,16 +12289,16 @@
     "codeName" : "VMGroup2",
     "name" : "视图消息组2",
     "getPSAppViewMsgGroupDetails" : [ {
-      "name" : "视图消息",
+      "name" : "视图消息2",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg2"
+        "id" : "ViewMsg3"
       }
     }, {
-      "name" : "视图消息2",
+      "name" : "视图消息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg3"
+        "id" : "ViewMsg2"
       }
     } ]
   }, {
@@ -12333,16 +12333,16 @@
         "id" : "ViewMsg4"
       }
     }, {
-      "name" : "消息类型-错误信息",
+      "name" : "消息类型-警告信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg6"
+        "id" : "ViewMsg5"
       }
     }, {
-      "name" : "消息类型-警告信息",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg5"
+        "id" : "ViewMsg6"
       }
     } ]
   }, {
@@ -12365,10 +12365,10 @@
         "id" : "ViewMsg7"
       }
     }, {
-      "name" : "消息位置-弹出",
+      "name" : "消息位置-视图内容区",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg10"
+        "id" : "ViewMsg9"
       }
     }, {
       "name" : "消息位置-视图下方",
@@ -12377,10 +12377,10 @@
         "id" : "ViewMsg8"
       }
     }, {
-      "name" : "消息位置-视图内容区",
+      "name" : "消息位置-弹出",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg9"
+        "id" : "ViewMsg10"
       }
     } ]
   }, {
@@ -12393,13 +12393,6 @@
         "id" : "ViewMsg5"
       },
       "position" : "POPUP"
-    }, {
-      "name" : "消息类型-错误信息",
-      "getPSAppViewMsg" : {
-        "modelref" : true,
-        "id" : "ViewMsg6"
-      },
-      "position" : "POPUP"
     }, {
       "name" : "消息类型-常规信息",
       "getPSAppViewMsg" : {
@@ -12425,6 +12418,12 @@
         "modelref" : true,
         "id" : "ViewMsg12"
       }
+    }, {
+      "name" : "关闭模式-本次删除-上方-警告",
+      "getPSAppViewMsg" : {
+        "modelref" : true,
+        "id" : "ViewMsg13"
+      }
     }, {
       "name" : "消息位置-视图下方",
       "getPSAppViewMsg" : {
@@ -12432,11 +12431,12 @@
         "id" : "ViewMsg8"
       }
     }, {
-      "name" : "关闭模式-本次删除-上方-警告",
+      "name" : "消息类型-错误信息",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
-      }
+        "id" : "ViewMsg6"
+      },
+      "position" : "POPUP"
     } ]
   }, {
     "codeName" : "VMGroup5",
@@ -12448,16 +12448,16 @@
         "id" : "ViewMsg12"
       }
     }, {
-      "name" : "关闭模式-无删除",
+      "name" : "关闭模式-本次删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg11"
+        "id" : "ViewMsg13"
       }
     }, {
-      "name" : "关闭模式-本次删除",
+      "name" : "关闭模式-无删除",
       "getPSAppViewMsg" : {
         "modelref" : true,
-        "id" : "ViewMsg13"
+        "id" : "ViewMsg11"
       }
     } ]
   }, {

trainsys-provider/pom.xml

@@ -33,7 +33,7 @@
 
     <profiles>
         <profile>
-            <id>trainsys</id>
+            <id>runtime</id>
             <build>
                 <resources>
                     <resource>

trainsys-provider/src/main/docker/Dockerfile

@@ -10,6 +10,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Duser.timezone=$TZ -Djava.security.egd=file:/dev/./urandom -jar /trainsys-provider.jar
 
-EXPOSE 50000
+EXPOSE 8081
 
 ADD trainsys-provider.jar /trainsys-provider.jar

trainsys-provider/src/main/docker/trainsys-provider-trainsys-k8s.yaml

@@ -22,32 +22,7 @@ spec:
         image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
         imagePullPolicy: Always
         ports:
-        - containerPort: 50000
-        env:
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_IP
-          value: "172.16.240.140"      
-        - name: SERVER_PORT
-          value: "50000"
-        - name: SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR
-          value: "172.16.240.140:8848"
-        - name: SPRING_REDIS_HOST
-          value: "127.0.0.1"
-        - name: SPRING_REDIS_PORT
-          value: "6379"
-        - name: SPRING_REDIS_DATABASE
-          value: "0"
-        - name: SPRING_DATASOURCE_USERNAME
-          value: "a_LAB01_d23cc850e"
-        - name: SPRING_DATASOURCE_PASSWORD
-          value: "f9Df4556"
-        - name: SPRING_DATASOURCE_URL
-          value: "jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8"
-        - name: SPRING_DATASOURCE_DRIVER-CLASS-NAME
-          value: "com.mysql.jdbc.Driver"
-        - name: SPRING_DATASOURCE_DEFAULTSCHEMA
-          value: "a_LAB01_d23cc850e"
-        - name: NACOS
-          value: "172.16.240.140:8848"      
+        - containerPort: 8081
 
 ---
 apiVersion: v1
@@ -60,9 +35,9 @@ spec:
   type: NodePort
   ports:
   - name: http
-    port: 50000
-    targetPort: 50000
-    nodePort: 50000
+    port: 8081
+    targetPort: 8081
+    nodePort: 8081
     protocol: TCP
   selector:
     app: trainsys-provider

trainsys-provider/src/main/docker/trainsys-provider-trainsys.yaml

@@ -3,23 +3,9 @@ services:
   trainsys-provider:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/trainsys-provider:latest
     ports:
-      - "50000:50000"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.140
-      - SERVER_PORT=50000
-      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_CLOUD_NACOS_CONFIG_SERVER-ADDR=172.16.240.140:8848
-      - SPRING_REDIS_HOST=127.0.0.1
-      - SPRING_REDIS_PORT=6379
-      - SPRING_REDIS_DATABASE=0
-      - SPRING_DATASOURCE_USERNAME=a_LAB01_d23cc850e
-      - SPRING_DATASOURCE_PASSWORD=f9Df4556
-      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_d23cc850e?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&serverTimezone=Asia/Shanghai&allowMultiQueries=true&serverTimezone=GMT%2B8
-      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
-      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_d23cc850e
-      - NACOS=172.16.240.140:8848
     deploy:
       resources:
            limits: