Skip to content

I
iBiz企业中心
提交 daad1c0a 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

xignzi006 部署微服务应用

上级 2b047ed1
显示空白字符变更
内嵌 并排
正在显示 包含 379 行增加 和 293 行删除
app_BusinessCentral/src/components/app-form-group/app-form-group.less
浏览文件 @ daad1c0a
.app-form-group {
>.ivu-card-head {
>p {
>i {
......@@ -7,9 +8,12 @@
}
}
}
>.ivu-card-extra {
.item-extract-mode {
display: flex;
.item {
margin-left: 12px;
}
......@@ -18,6 +22,7 @@
}
.app-form-group.app-group-collapse-contant {
.ivu-card-body {
display: none;
}
......@@ -25,9 +30,12 @@
.app-group-flex {
height: 100%;
overflow: auto;
> .ivu-card-body {
overflow-y: auto;
overflow-x: hidden;
>.ivu-card-body {
height: calc(100% - 51px);
overflow: auto;
overflow-y: auto;
overflow-x: hidden;
}
}
\ No newline at end of file
app_BusinessCentral/src/components/app-form-group/app-form-group.vue
浏览文件 @ daad1c0a
<template>
<div class="app-form-group">
<div v-if="uiStyle=='STYLE2'">
<div :class="classes">
<template v-if="uiStyle=='STYLE2'">
<app-form-group2
:caption="caption"
:uiStyle="uiStyle"
......@@ -10,8 +10,8 @@
:titleBarCloseMode="titleBarCloseMode">
<slot></slot>
</app-form-group2>
</div>
<div v-else>
</template>
<template v-else>
<card v-if="isShowCaption === true" :bordered="false" :dis-hover="true" :class="classes">
<p class='' slot='title'>
<icon v-if="titleBarCloseMode !== 0" :type="collapseContant ? 'ios-arrow-dropright-circle' : 'ios-arrow-dropdown-circle'"
......@@ -87,17 +87,17 @@
</template>
</a >
</template>
<div v-if="Object.is(layoutType, 'FLEX')">
<template v-if="Object.is(layoutType, 'FLEX')">
<slot></slot>
</div>
<div v-if="!Object.is(layoutType, 'FLEX')">
</template>
<template v-if="!Object.is(layoutType, 'FLEX')">
<row :gutter="10"><slot></slot></row>
</div>
</template>
</card>
<row v-if="isShowCaption === false" :class="classes">
<template v-if="isShowCaption === false">
<slot></slot>
</row>
</div>
</template>
</template>
</div>
</template>
......
app_BusinessCentral/src/components/app-form-item/app-form-item.less
浏览文件 @ daad1c0a
.app-form-item-wrapper {
height: 100%;
}
.app-form-item {
height: 100%;
>.ivu-form-item-label {
text-decoration: none;
......@@ -8,45 +13,58 @@
}
>.ivu-form-item-content {
height: 100%;
min-height: 36px;
>.editor {
height: 100%;
}
}
}
.app-form-item-label-top {
.app-form-item.label-top, .app-form-item.label-bottom {
>.ivu-form-item-label {
float: none;
display: inline-block;
padding: 0 0 10px;
.app-form-item-label {
height: 16px;
}
.editor {
height: calc(100% - 16px);
}
}
.app-form-item-label-left {
.app-form-item.label-left, .app-form-item.label-right {
.app-form-item-label, .editor {
height: 100%;
}
}
.app-form-item.label-left {
.app-form-item-label {
float: left;
text-align: right;
padding-right: 12px;
padding-right: 10px;
}
}
.app-form-item-label-right {
.app-form-item.label-right {
.app-form-item-label {
float: right;
text-align: left;
padding-left: 12px;
padding-left: 10px;
}
}
.app-form-item-label-top {
.app-form-item.label-none {
.app-form-item-label {
display: block;
padding-bottom: 10px;
display: none !important;
}
}
.app-form-item-label-bottom {
.app-form-item-label {
display: block;
padding-top: 10px;
.editor {
height: 100%;
}
}
\ No newline at end of file
app_BusinessCentral/src/components/app-form-item/app-form-item.vue
浏览文件 @ daad1c0a
<template>
<form-item
:prop="name"
<div class="app-form-item-wrapper">
<template v-if="this.uiStyle === 'STYLE2'">
<app-form-item2
:caption="caption"
:labelStyle="labelStyle"
:error="error"
:required="required"
:rules="rules"
:class="classes"
:labelPos="labelPos"
:labelWidth="labelWidth"
:isShowCaption="isShowCaption"
:isEmptyCaption="isEmptyCaption"
:name="name"
:uiStyle="uiStyle"
:itemRules="itemRules">
<slot></slot>
</app-form-item2>
</template>
<template v-if="this.uiStyle !== 'STYLE2'">
<form-item :prop="name" :error="error" :required="required" :rules="rules" :class="classes">
<div
v-if="Object.is(this.labelPos,'BOTTOM') || Object.is(this.labelPos,'NONE') || !this.labelPos"
class="editor"
:style="slotstyle"
>
<div v-if="Object.is(this.labelPos,'BOTTOM') || Object.is(this.labelPos,'NONE') || !this.labelPos" class="slot-editor" :style="slotstyle">
<slot></slot>
</div>
<span v-if="!Object.is(this.labelPos,'NONE') && this.isShowCaption && this.labelWidth > 0" :style="labelstyle" :class="labelclasses">
{{this.isEmptyCaption ? '' : this.caption}}
</span>
<div v-if="Object.is(this.labelPos,'TOP') || Object.is(this.labelPos,'LEFT') || Object.is(this.labelPos,'RIGHT')" class="slot-editor" :style="slotstyle">
<span
v-if="!Object.is(this.labelPos,'NONE') && this.isShowCaption && this.labelWidth > 0"
:style="labelstyle"
:class="labelclasses"
>
{{this.isEmptyCaption ? '' : this.caption}}</span>
<div
v-if="Object.is(this.labelPos,'TOP') || Object.is(this.labelPos,'LEFT') || Object.is(this.labelPos,'RIGHT')"
class="editor"
:style="slotstyle"
>
<slot></slot>
</div>
</form-item>
</template>
</div>
</template>
<script lang="ts">
import { Vue, Component, Prop, Watch } from 'vue-property-decorator';
import { Vue, Component, Prop, Watch } from "vue-property-decorator";
@Component({})
export default class AppFormItem extends Vue {
/**
* 名称
*
......@@ -53,7 +76,13 @@ export default class AppFormItem extends Vue {
* @type {(string | 'BOTTOM' | 'LEFT' | 'NONE' | 'RIGHT' | 'TOP')}
* @memberof AppFormItem
*/
@Prop() public labelPos?: string | 'BOTTOM' | 'LEFT' | 'NONE' | 'RIGHT' | 'TOP';
@Prop() public labelPos?:
| string
| "BOTTOM"
| "LEFT"
| "NONE"
| "RIGHT"
| "TOP";
/**
* 标签宽度
......@@ -126,7 +155,7 @@ export default class AppFormItem extends Vue {
* @param {*} oldVal
* @memberof AppFormItem
*/
@Watch('itemRules',{deep:true})
@Watch("itemRules", { deep: true })
onItemRulesChange(newVal: any, oldVal: any) {
if (newVal) {
try {
......@@ -134,14 +163,13 @@ export default class AppFormItem extends Vue {
const _rules: any[] = newVal;
this.rules = [..._rules];
this.rules.some((rule: any) => {
if (rule.hasOwnProperty('required')) {
if (rule.hasOwnProperty("required")) {
this.required = rule.required;
return true;
}
return false;
});
} catch (error) {
}
} catch (error) {}
}
}
......@@ -153,28 +181,25 @@ export default class AppFormItem extends Vue {
* @memberof AppFormItem
*/
get classes(): string[] {
let posClass = '';
let posClass = "";
switch (this.labelPos) {
case 'TOP':
posClass = 'app-form-item-label-top';
case "TOP":
posClass = "label-top";
break;
case 'LEFT':
posClass = 'app-form-item-label-left';
case "LEFT":
posClass = "label-left";
break;
case 'BOTTOM':
posClass = 'app-form-item-label-bottom';
case "BOTTOM":
posClass = "label-bottom";
break;
case 'RIGHT':
posClass = 'app-form-item-label-right';
case "RIGHT":
posClass = "label-right";
break;
case 'NONE':
posClass = 'app-form-item-label-none';
case "NONE":
posClass = "label-none";
break;
}
return [
'app-form-item',
posClass
];
return [ "app-form-item", posClass ];
}
/**
......@@ -184,8 +209,10 @@ export default class AppFormItem extends Vue {
* @type {string}
* @memberof AppFormItem
*/
get labelclasses():string{
return this.labelStyle?this.labelStyle+' app-form-item-label':'app-form-item-label';
get labelclasses(): string {
return this.labelStyle
? this.labelStyle + " app-form-item-label"
: "app-form-item-label";
}
/**
......@@ -195,8 +222,10 @@ export default class AppFormItem extends Vue {
* @type {string}
* @memberof AppFormItem
*/
get labelstyle():any{
return {width:this.labelWidth+'px'};
get labelstyle(): any {
if (Object.is(this.labelPos, 'LEFT') || Object.is(this.labelPos, 'RIGHT')) {
return { width: this.labelWidth + "px" };
}
}
/**
......@@ -206,11 +235,11 @@ export default class AppFormItem extends Vue {
* @type {string}
* @memberof AppFormItem
*/
get slotstyle():any{
if(Object.is(this.labelPos,'LEFT')){
return {marginLeft:this.labelWidth+'px'};
}else if(Object.is(this.labelPos,'RIGHT')){
return {marginRight:this.labelWidth+'px'};
get slotstyle(): any {
if (Object.is(this.labelPos, "LEFT")) {
return { marginLeft: this.labelWidth + "px" };
} else if (Object.is(this.labelPos, "RIGHT")) {
return { marginRight: this.labelWidth + "px" };
}
}
......@@ -225,19 +254,17 @@ export default class AppFormItem extends Vue {
const _rules: any[] = this.itemRules;
this.rules = [..._rules];
this.rules.some((rule: any) => {
if (rule.hasOwnProperty('required')) {
if (rule.hasOwnProperty("required")) {
this.required = rule.required;
return true;
}
return false;
});
} catch (error) {
} catch (error) {}
}
}
}
}
</script>
<style lang='less'>
@import './app-form-item.less';
@import "./app-form-item.less";
</style>
\ No newline at end of file
app_BusinessCentral/src/components/login/login.vue
浏览文件 @ daad1c0a
......@@ -40,7 +40,7 @@
class="login_reset">重置
</i-button>
</form-item>
<!--
<form-item>
<div style="text-align: center">
<span class="form_tipinfo">其他登录方式</span>
......@@ -53,7 +53,7 @@
<img src="/assets/img/weixin.svg" class="wx-svg-container" draggable="false">
</div>
</div>
</form-item>
</form-item> -->
</i-form>
<p class='login-tip'>
......@@ -87,7 +87,7 @@ export default class Login extends Vue {
* @type {*}
* @memberof Login
*/
public form: any = {loginname: 'guest', password: 'guest'};
public form: any = {loginname: 'pms_guest', password: 'guest@123'};
/**
*　登录提示语
......@@ -166,6 +166,9 @@ export default class Login extends Vue {
* @memberof Login
*/
public handleSubmit(): void {
let leftTime = new Date();
leftTime.setTime(leftTime.getSeconds() - 1000);
document.cookie = "ibzuaa-token=;expires=" + leftTime.toUTCString();
const form: any = this.$refs.loginForm;
let validatestate: boolean = true;
form.validate((valid: boolean) => {
......@@ -219,7 +222,7 @@ export default class Login extends Vue {
*/
public goReset(): void {
const _this = this;
_this.form={loginname: 'guest', password: 'guest'}
_this.form={loginname: 'pms_guest', password: 'guest@123'}
}
/**
......
app_BusinessCentral/src/engine/view/edit-view-engine.ts
浏览文件 @ daad1c0a
......@@ -253,6 +253,7 @@ export default class EditViewEngine extends ViewEngine {
this.view.$route.meta.info = info;
}
this.view.model.srfTitle = `${this.view.$t(viewdata.srfTitle)} - ${viewdata.dataInfo}`;
this.view.$emit('viewModelChange', this.view.model.srfTitle);
}
}
......
app_BusinessCentral/src/studio-core/components/html-container/html-container.vue
浏览文件 @ daad1c0a
<template>
<div class="html-container" v-html="content"></div>
<div class="html-container" v-html="rHtml"></div>
</template>
<script lang="tsx">
import { Vue, Component, Prop, Watch } from 'vue-property-decorator';
import { Environment } from '../../../environments/environment';
/**
* 操作历史记录
......@@ -14,14 +15,34 @@ import { Vue, Component, Prop, Watch } from 'vue-property-decorator';
@Component({})
export default class HtmlContainer extends Vue {
/**
* 替换后html内容
*
* @type string
* @memberof HtmlContainer
*/
protected rHtml: string = '';
/**
* 呈现的Html内容
*
* @type string
* @memberof HtmlContainer
*/
@Prop({ default: '' })
@Prop({ default: `` })
public content!: string;
/**
* 监控html变化
*
* @memberof HtmlContainer
*/
@Watch('content', { immediate: true })
public watchContent(): void {
if (this.content && !Object.is(this.content, '')) {
this.rHtml = this.content.replace(/\{(\d+)\.(bmp|jpg|jpeg|png|tif|gif|pcx|tga|exif|fpx|svg|psd|cdr|pcd|dxf|ufo|eps|ai|raw|WMF|webp)\}/g, `${Environment.BaseUrl}${Environment.ExportFile}/$1`);
}
}
}
</script>
<style lang="less" scoped>
......
app_BusinessCentral/src/studio-core/index.ts
浏览文件 @ daad1c0a
......@@ -44,7 +44,8 @@ export const StudioCore = {
v.component('studio-view', StudioView);
v.component('studio-embed-view', StudioEmbedView);
v.component('view-config-actions', ViewConfigActions);
v.component('html-container', HtmlContainer);
// 注册指令
v.directive('notification-signal', NotificationSignal);
v.directive('html-container', HtmlContainer);
}
};
\ No newline at end of file
app_BusinessCentral/src/studio-core/service/UIStateService.ts
浏览文件 @ daad1c0a
......@@ -37,11 +37,14 @@ export class UIStateService {
const data: any = localStorage.getItem(this.localStoreKey);
if (data) {
this.fillLayoutState(JSON.parse(data));
} else {
this.fillLayoutState({});
}
} catch (error) {
this.fillLayoutState({});
}
} catch (error) { }
let z = this;
on(window, 'beforeunload', () => {
console.log(z.layoutState)
localStorage.setItem(this.localStoreKey, JSON.stringify(this.layoutState));
});
}
......
app_BusinessCentral/src/studio-core/utils/studio-drawer/studio-drawer.tsx
浏览文件 @ daad1c0a
......@@ -219,6 +219,9 @@ export class StudioDrawer extends Vue {
{this.showViewList.map((item, i) => {
const ref: any = this.$refs[item.viewname + i];
if (!ref) {
setTimeout(() => {
this.$forceUpdate();
}, 300);
return;
}
return <span key={i}>
......
app_BusinessCentral/src/user-default-register.ts
浏览文件 @ daad1c0a
import Vue from 'vue';
import { StudioCore } from './studio-core';
import IBizStudioComponentsVue from 'ibiz-studio-components-vue';
import AppVuePivotTable from './components/app-vue-pivottable/app-vue-pivottable.vue';
// 注册Vue插件
export const UserDefaultComponent = {
install(v: any, opt: any) {
Vue.use(StudioCore);
Vue.use(IBizStudioComponentsVue);
v.component('app-vue-pivottable', AppVuePivotTable);
}
};
\ No newline at end of file
app_BusinessCentral/src/user-register.ts
浏览文件 @ daad1c0a
import Vue from 'vue';
import IBizStudioComponentsVue from 'ibiz-studio-components-vue';
import { UserDefaultComponent } from './user-default-register';
import AppVuePivotTable from './components/app-vue-pivottable/app-vue-pivottable.vue';
// 注册Vue插件
export const UserComponent = {
install(v: any, opt: any) {
Vue.use(UserDefaultComponent);
Vue.use(IBizStudioComponentsVue);
v.component('app-vue-pivottable', AppVuePivotTable);
}
};
\ No newline at end of file
app_BusinessCentral/src/utils/view-tool/view-tool.ts
浏览文件 @ daad1c0a
......@@ -82,7 +82,7 @@ export class ViewTool {
if (param && !Object.is(param, '')) {
return `/${_pathName}/${param}`;
}
return `/${_pathName}/null`;
return `/${_pathName}`;
}
/**
......@@ -100,13 +100,13 @@ export class ViewTool {
let [arg] = args;
arg = arg ? arg : {};
deResParameters.forEach(({ pathName, parameterName }: { pathName: string, parameterName: string }) => {
let value:any = null;
let value: any = null;
if (viewParam[parameterName] && !Object.is(viewParam[parameterName], '') && !Object.is(viewParam[parameterName], 'null')) {
value = viewParam[parameterName];
} else if (arg[parameterName] && !Object.is(arg[parameterName], '') && !Object.is(arg[parameterName], 'null')) {
value = arg[parameterName];
}
routePath = `${routePath}/${pathName}/${value}`;
routePath = `${routePath}/${pathName}` + value !== null ? `/${value}` : '';
});
return routePath;
}
......
businesscentral-app/businesscentral-app-businesscentral/src/main/docker/Dockerfile
浏览文件 @ daad1c0a
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-app-businesscentral.jar
EXPOSE 8080
EXPOSE 10320
ADD businesscentral-app-businesscentral.jar /businesscentral-app-businesscentral.jar
businesscentral-app/businesscentral-app-businesscentral/src/main/docker/businesscentral-app-businesscentral.yaml
浏览文件 @ daad1c0a
......@@ -3,9 +3,23 @@ services:
businesscentral-app-businesscentral:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-app-businesscentral:latest
ports:
- "8080:8080"
- "10320:10320"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10320
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy:
resources:
limits:
......
businesscentral-provider/businesscentral-provider-centralapi/src/main/docker/Dockerfile
浏览文件 @ daad1c0a
......@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /businesscentral-provider-centralapi.jar
EXPOSE 10310
EXPOSE 8081
ADD businesscentral-provider-centralapi.jar /businesscentral-provider-centralapi.jar
businesscentral-provider/businesscentral-provider-centralapi/src/main/docker/businesscentral-provider-centralapi.yaml
浏览文件 @ daad1c0a
......@@ -3,23 +3,9 @@ services:
businesscentral-provider-centralapi:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/businesscentral-provider-centralapi:latest
ports:
- "10310:10310"
- "8081:8081"
networks:
- agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.240.110
- SERVER_PORT=10310
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.240.110:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_LAB01_e85d8801c
- SPRING_DATASOURCE_PASSWORD=b1@@@772
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.186.185:3306/a_LAB01_e85d8801c?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_LAB01_e85d8801c
- CAS=https://passport.ibizlab.cn
- NACOS=172.16.240.110:8848
deploy:
resources:
limits:
......
config.xml
浏览文件 @ daad1c0a
......@@ -37,11 +37,11 @@
git clone -b master $para2 ibizbusinesscentral/
export NODE_OPTIONS=--max-old-space-size=4096
cd ibizbusinesscentral/
mvn clean package -Pcentralapi
cd businesscentral-provider/businesscentral-provider-centralapi
mvn -Pcentralapi docker:build
mvn -Pcentralapi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-provider-centralapi.yaml iBizEE --with-registry-auth
mvn clean package -Pbusinesscentral
cd businesscentral-app/businesscentral-app-businesscentral
mvn -Pbusinesscentral docker:build
mvn -Pbusinesscentral docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/businesscentral-app-businesscentral.yaml iBizEE --with-registry-auth
</command>
</hudson.tasks.Shell>
</builders>
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或