Skip to content

T
TrainSys
提交 e4ed6d8c 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

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

上级 ae774b71
显示空白字符变更
内嵌 并排
正在显示 包含 1161 行增加 和 484 行删除
app_Mob/package.json
浏览文件 @ e4ed6d8c
......@@ -11,13 +11,13 @@
},
"dependencies": {
"@ibiz-template-package/vs-tree-ex": "^0.1.1",
"@ibiz-template/core": "0.1.36",
"@ibiz-template/mob-theme": "^0.2.4",
"@ibiz-template/mob-vue3-components": "0.0.1-alpha.15",
"@ibiz-template/model-helper": "0.1.37",
"@ibiz-template/runtime": "0.1.37",
"@ibiz-template/theme": "0.1.24",
"@ibiz-template/vue3-util": "0.1.37",
"@ibiz-template/core": "0.2.0",
"@ibiz-template/mob-theme": "^0.2.5",
"@ibiz-template/mob-vue3-components": "0.0.1-alpha.16",
"@ibiz-template/model-helper": "0.2.0",
"@ibiz-template/runtime": "0.2.0",
"@ibiz-template/theme": "0.2.0",
"@ibiz-template/vue3-util": "0.2.0",
"@ibiz/model-core": "^0.0.19",
"async-validator": "^4.2.5",
"dayjs": "^1.11.10",
......@@ -29,19 +29,19 @@
"qx-util": "^0.4.8",
"ramda": "^0.29.1",
"vant": "^4.7.2",
"vue": "^3.3.4",
"vue": "^3.3.6",
"vue-i18n": "^9.5.0",
"vue-router": "^4.2.5"
},
"devDependencies": {
"@commitlint/cli": "^17.8.0",
"@commitlint/config-conventional": "^17.8.0",
"@commitlint/cli": "^18.0.0",
"@commitlint/config-conventional": "^18.0.0",
"@types/jest": "^29.5.6",
"@types/lodash-es": "^4.17.10",
"@types/node": "^20.8.7",
"@types/qs": "^6.9.9",
"@types/ramda": "^0.29.6",
"@types/systemjs": "^6.13.3",
"@types/ramda": "^0.29.7",
"@types/systemjs": "^6.13.4",
"@typescript-eslint/eslint-plugin": "^6.8.0",
"@typescript-eslint/parser": "^6.8.0",
"@vitejs/plugin-legacy": "^4.1.1",
......@@ -50,16 +50,16 @@
"@vue/babel-helper-vue-jsx-merge-props": "^1.4.0",
"@vue/eslint-config-typescript": "^12.0.0",
"cpy": "8.1.2",
"eslint": "^8.51.0",
"eslint": "^8.52.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-config-prettier": "^9.0.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-import": "^2.29.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-unused-imports": "^3.0.0",
"eslint-plugin-vue": "^9.17.0",
"husky": "^8.0.3",
"jsdom": "^22.1.0",
"lint-staged": "^15.0.1",
"lint-staged": "^15.0.2",
"postcss": "^8.4.31",
"postcss-scss": "^4.0.9",
"prettier": "^3.0.3",
......@@ -77,7 +77,7 @@
"vite": "^4.5.0",
"vite-plugin-eslint": "^1.8.1",
"vue-eslint-parser": "^9.3.2",
"vue-tsc": "^1.8.19"
"vue-tsc": "^1.8.20"
},
"lint-staged": {
"*.{ts,vue}": "eslint --fix",
......
app_Mob/pnpm-lock.yaml
浏览文件 @ e4ed6d8c
因为 它太大了无法显示 源差异 。您可以改为 查看blob。
app_Mob/public/extras/js/pinia/2.1.7/pinia.system.prod.js 0 → 100644
浏览文件 @ e4ed6d8c
/*!
* pinia v2.1.7
* (c) 2023 Eduardo San Martin Morote
* @license MIT
*/
System.register(["vue"],(function(t){"use strict";var e,n,i,o,s,r,c,a,u,p,f,h,l,d,y,$;return{setters:[function(t){e=t.hasInjectionContext,n=t.inject,i=t.effectScope,o=t.ref,s=t.markRaw,r=t.getCurrentScope,c=t.onScopeDispose,a=t.watch,u=t.reactive,p=t.isRef,f=t.isReactive,h=t.toRaw,l=t.nextTick,d=t.toRefs,y=t.computed,$=t.toRef}],execute:function(){t({acceptHMRUpdate:function(t,e){return()=>{}},createPinia:function(){const t=i(!0),e=t.run((()=>o({})));let n=[],r=[];const c=s({install(t){_(c),c._a=t,t.provide(j,c),t.config.globalProperties.$pinia=c,r.forEach((t=>n.push(t))),r=[]},use(t){return this._a||v?n.push(t):r.push(t),this},_p:n,_a:null,_e:t,_s:new Map,state:e});return c},defineStore:function(t,i,o){let r,c;const a="function"==typeof i;"string"==typeof t?(r=t,c=a?o:i):(c=t,r=t.id);function u(t,o){const u=e();(t=t||(u?n(j,null):null))&&_(t),(t=b)._s.has(r)||(a?M(r,i,c,t):function(t,e,n,i){const{state:o,actions:r,getters:c}=e,a=n.state.value[t];let u;function p(){a||(n.state.value[t]=o?o():{});const e=d(n.state.value[t]);return x(e,r,Object.keys(c||{}).reduce(((e,i)=>(e[i]=s(y((()=>{_(n);const e=n._s.get(t);return c[i].call(e,e)}))),e)),{}))}u=M(t,p,e,n,i,!0)}(r,c,t));return t._s.get(r)}return u.$id=r,u},mapActions:function(t,e){return Array.isArray(e)?e.reduce(((e,n)=>(e[n]=function(...e){return t(this.$pinia)[n](...e)},e)),{}):Object.keys(e).reduce(((n,i)=>(n[i]=function(...n){return t(this.$pinia)[e[i]](...n)},n)),{})},mapState:C,mapStores:function(...t){return t.reduce(((t,e)=>(t[e.$id+E]=function(){return e(this.$pinia)},t)),{})},mapWritableState:function(t,e){return Array.isArray(e)?e.reduce(((e,n)=>(e[n]={get(){return t(this.$pinia)[n]},set(e){return t(this.$pinia)[n]=e}},e)),{}):Object.keys(e).reduce(((n,i)=>(n[i]={get(){return t(this.$pinia)[e[i]]},set(n){return t(this.$pinia)[e[i]]=n}},n)),{})},setMapStoreSuffix:function(t){E=t},skipHydrate:function(t){return Object.defineProperty(t,k,{})},storeToRefs:function(t){{t=h(t);const e={};for(const n in t){const i=t[n];(p(i)||f(i))&&(e[n]=$(t,n))}return e}}});var v=!1;let b;const _=t("setActivePinia",(t=>b=t)),j=(t("getActivePinia",(()=>e()&&n(j)||b)),Symbol());function S(t){return t&&"object"==typeof t&&"[object Object]"===Object.prototype.toString.call(t)&&"function"!=typeof t.toJSON}var g;t("MutationType",g),function(t){t.direct="direct",t.patchObject="patch object",t.patchFunction="patch function"}(g||t("MutationType",g={}));const O="undefined"!=typeof window;const m=()=>{};function P(t,e,n,i=m){t.push(e);const o=()=>{const n=t.indexOf(e);n>-1&&(t.splice(n,1),i())};return!n&&r()&&c(o),o}function A(t,...e){t.slice().forEach((t=>{t(...e)}))}const w=t=>t();function R(t,e){t instanceof Map&&e instanceof Map&&e.forEach(((e,n)=>t.set(n,e))),t instanceof Set&&e instanceof Set&&e.forEach(t.add,t);for(const n in e){if(!e.hasOwnProperty(n))continue;const i=e[n],o=t[n];t[n]=S(o)&&S(i)&&t.hasOwnProperty(n)&&!p(i)&&!f(i)?R(o,i):i}return t}const k=Symbol();const{assign:x}=Object;function M(t,e,n={},s,r,c){let d;const y=x({actions:{}},n),$={deep:!0};let v,b,j,O=[],M=[];const E=s.state.value[t];let C;function I(e){let n;v=b=!1,"function"==typeof e?(e(s.state.value[t]),n={type:g.patchFunction,storeId:t,events:j}):(R(s.state.value[t],e),n={type:g.patchObject,payload:e,storeId:t,events:j});const i=C=Symbol();l().then((()=>{C===i&&(v=!0)})),b=!0,A(O,n,s.state.value[t])}c||E||(s.state.value[t]={}),o({});const T=c?function(){const{state:t}=n,e=t?t():{};this.$patch((t=>{x(t,e)}))}:m;function F(e,n){return function(){_(s);const i=Array.from(arguments),o=[],r=[];let c;A(M,{args:i,name:e,store:W,after:function(t){o.push(t)},onError:function(t){r.push(t)}});try{c=n.apply(this&&this.$id===t?this:W,i)}catch(t){throw A(r,t),t}return c instanceof Promise?c.then((t=>(A(o,t),t))).catch((t=>(A(r,t),Promise.reject(t)))):(A(o,c),c)}}const H={_p:s,$id:t,$onAction:P.bind(null,M),$patch:I,$reset:T,$subscribe(e,n={}){const i=P(O,e,n.detached,(()=>o())),o=d.run((()=>a((()=>s.state.value[t]),(i=>{("sync"===n.flush?b:v)&&e({storeId:t,type:g.direct,events:j},i)}),x({},$,n))));return i},$dispose:function(){d.stop(),O=[],M=[],s._s.delete(t)}},W=u(H);s._s.set(t,W);const D=(s._a&&s._a.runWithContext||w)((()=>s._e.run((()=>(d=i()).run(e)))));for(const e in D){const n=D[e];if(p(n)&&(!p(J=n)||!J.effect)||f(n))c||(!E||S(G=n)&&G.hasOwnProperty(k)||(p(n)?n.value=E[e]:R(n,E[e])),s.state.value[t][e]=n);else if("function"==typeof n){const t=F(e,n);D[e]=t,y.actions[e]=n}}var G,J;return x(W,D),x(h(W),D),Object.defineProperty(W,"$state",{get:()=>s.state.value[t],set:t=>{I((e=>{x(e,t)}))}}),s._p.forEach((t=>{x(W,d.run((()=>t({store:W,app:s._a,pinia:s,options:y}))))})),E&&c&&n.hydrate&&n.hydrate(W.$state,E),v=!0,b=!0,W}let E="Store";function C(t,e){return Array.isArray(e)?e.reduce(((e,n)=>(e[n]=function(){return t(this.$pinia)[n]},e)),{}):Object.keys(e).reduce(((n,i)=>(n[i]=function(){const n=t(this.$pinia),o=e[i];return"function"==typeof o?o.call(this,n):n[o]},n)),{})}t("mapGetters",C);t("PiniaVuePlugin",(function(t){t.mixin({beforeCreate(){const t=this.$options;if(t.pinia){const e=t.pinia;if(!this._provided){const t={};Object.defineProperty(this,"_provided",{get:()=>t,set:e=>Object.assign(t,e)})}this._provided[j]=e,this.$pinia||(this.$pinia=e),e._a=this,O&&_(e)}else!this.$pinia&&t.parent&&t.parent.$pinia&&(this.$pinia=t.parent.$pinia)},destroyed(){delete this._pStores}})}))}}}));
app_Mob/public/extras/json/system-import.json
浏览文件 @ e4ed6d8c
......@@ -18,7 +18,7 @@
"lodash-es": "../js/lodash/4.17.21/lodash.min.js",
"qx-util": "../js/qx-util/0.4.8/qx-util.umd.js",
"vuedraggable": "../js/vuedraggable/4.1.0/vuedraggable.umd.min.js",
"pinia": "../js/pinia/2.1.6/pinia.system.prod.js",
"pinia": "../js/pinia/2.1.7/pinia.system.prod.js",
"cherry-markdown": "../js/cherry-markdown/0.8.26/cherry-markdown.system.min.js",
"path-browserify": "../js/path-browserify/1.0.1/index.system.min.js",
"@ibiz-template-package/vs-tree-ex": "../js/@ibiz-template-package/vs-tree-ex/0.1.1/vs-tree.system.js",
......
app_Mob/src/App.tsx
浏览文件 @ e4ed6d8c
import { useViewStack } from '@ibiz-template/mob-vue3-components';
import {
useViewStack,
routerCallback,
} from '@ibiz-template/mob-vue3-components';
import { Modal, ViewMode } from '@ibiz-template/runtime';
import { defineComponent, onUnmounted, ref } from 'vue';
import './App.scss';
......@@ -27,7 +30,8 @@ export default defineComponent({
mode: ViewMode.ROUTE,
viewUsage: 1,
routeDepth: 1,
dismiss: () => {
dismiss: modal => {
routerCallback.close(key, modal);
goBack();
viewModals.delete(key);
},
......
app_Mob/src/create-vue-app.ts
浏览文件 @ e4ed6d8c
import { App, Component, createApp } from 'vue';
import MobVue3Components, {
i18n,
loadingDirective,
piniaInstance,
} from '@ibiz-template/mob-vue3-components';
import Vant, { allowMultipleToast } from 'vant';
......@@ -23,10 +25,15 @@ export function createVueApp(
rootProps?: IData,
): App<Element> {
const app = createApp(rootComponent, rootProps);
// 全局 Vue 异常处理
app.config.errorHandler = function (err: unknown): void {
ibiz.util.error.handle(err);
};
app.use(i18n);
app.use(Vant).use(piniaInstance).use(MobVue3Components).use(UserRegister);
ibiz.plugin.register(app);
// loading指令
app.directive('loading', loadingDirective);
return app;
}
app_Mob/src/main.ts
浏览文件 @ e4ed6d8c
......@@ -67,6 +67,7 @@ async function createApp(): Promise<void> {
installDefaultViewLayout((key, model) => {
ibiz.util.layoutPanel.register(key, model);
});
await ibiz.i18n.init();
app.mount('#app');
}
......
app_Mob/swarm.yaml
浏览文件 @ e4ed6d8c
......@@ -3,7 +3,7 @@ services:
trainsys-app-mob:
image: dstimage
ports:
- "80:80"
- "50200:80"
networks:
- agent_network
environment:
......
config.xml
浏览文件 @ e4ed6d8c
......@@ -55,6 +55,36 @@
git clone -b master $para2 trainsys/
export NODE_OPTIONS=--max-old-space-size=4096
cd trainsys/
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/Mob/PSSYSAPP.json
浏览文件 @ e4ed6d8c
......@@ -139,6 +139,7 @@
"codeListTag" : "Test__TestAll",
"codeListType" : "DYNAMIC",
"codeName" : "TestAll",
"customCond" : "{N_TESTNAME_LIKE: \"1\", navParam: \"%srfpersonname%\", size: \"%size%\"}",
"dynaInstMode" : 0,
"dynaModelFilePath" : "PSSYSAPPS/Mob/PSAPPCODELISTS/TestAll.json",
"emptyText" : "未定义",
trainsys-core/src/main/resources/model/cn/ibizlab/trainsys/PSSYSAPPS/TemplatePublish/PSSYSAPP.json
浏览文件 @ e4ed6d8c
......@@ -1432,16 +1432,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
浏览文件 @ e4ed6d8c
......@@ -9776,16 +9776,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"
}
} ]
}, {
......@@ -9814,12 +9814,6 @@
"codeName" : "VMGroup3",
"name" : "视图消息类型测试",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
}
}, {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
......@@ -9831,6 +9825,12 @@
"modelref" : true,
"id" : "ViewMsg6"
}
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
}
} ]
}, {
"codeName" : "VMGroup7",
......@@ -9851,12 +9851,6 @@
"modelref" : true,
"id" : "ViewMsg7"
}
}, {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg9"
}
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
......@@ -9869,31 +9863,17 @@
"modelref" : true,
"id" : "ViewMsg10"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg4"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-无删除-上方-常规",
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg11"
"id" : "ViewMsg9"
}
} ]
}, {
"codeName" : "VMGroup8",
"name" : "【静态测试】",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "消息位置-视图内容区",
"getPSAppViewMsg" : {
"modelref" : true,
......@@ -9905,12 +9885,26 @@
"modelref" : true,
"id" : "ViewMsg12"
}
}, {
"name" : "消息类型-警告信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg5"
},
"position" : "POPUP"
}, {
"name" : "关闭模式-本次删除-上方-警告",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg13"
}
}, {
"name" : "消息类型-错误信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
},
"position" : "POPUP"
}, {
"name" : "消息位置-视图下方",
"getPSAppViewMsg" : {
......@@ -9918,23 +9912,23 @@
"id" : "ViewMsg8"
}
}, {
"name" : "消息类型-错误信息",
"name" : "消息类型-常规信息",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg6"
"id" : "ViewMsg4"
},
"position" : "POPUP"
} ]
}, {
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-默认删除",
"name" : "关闭模式-无删除-上方-常规",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
"id" : "ViewMsg11"
}
} ]
}, {
"codeName" : "VMGroup5",
"name" : "视图消息关闭模式",
"getPSAppViewMsgGroupDetails" : [ {
"name" : "关闭模式-本次删除",
"getPSAppViewMsg" : {
"modelref" : true,
......@@ -9946,6 +9940,12 @@
"modelref" : true,
"id" : "ViewMsg11"
}
}, {
"name" : "关闭模式-默认删除",
"getPSAppViewMsg" : {
"modelref" : true,
"id" : "ViewMsg12"
}
} ]
}, {
"codeName" : "VMGroup6",
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或