提交 3e8c2113 编写于 作者: ibizdev's avatar ibizdev

ibiz4j 发布系统代码

上级 cf74cb07
...@@ -316,7 +316,14 @@ export default class AppPickerSelectView extends Vue { ...@@ -316,7 +316,14 @@ export default class AppPickerSelectView extends Vue {
this.keySet = []; this.keySet = [];
this.selectItems = []; this.selectItems = [];
if (newVal) { if (newVal) {
this.selectItems = JSON.parse(newVal); if (!this.data || !this.valueitem || !this.data[this.valueitem]) {
this.$Notice.error({ title: (this.$t('components.appPickerSelectView.error') as any), desc: (this.$t('components.appPickerSelectView.editor') as any)+this.name+(this.$t('components.appPickerSelectView.valueitemException') as any) });
}else{
let tempvalue: Array<any> = this.data[this.valueitem].split(',');
let temptext: Array<any> = newVal.split(',');
tempvalue.forEach((srfkey: any, index: number)=>{
this.selectItems.push({ srfmajortext : temptext[index], srfkey: srfkey });
});
this.selectItems.forEach((item: any) => { this.selectItems.forEach((item: any) => {
this.keySet.push(item.srfkey); this.keySet.push(item.srfkey);
let index = this.items.findIndex((i) => Object.is(i.srfkey, item.srfkey)); let index = this.items.findIndex((i) => Object.is(i.srfkey, item.srfkey));
...@@ -325,6 +332,7 @@ export default class AppPickerSelectView extends Vue { ...@@ -325,6 +332,7 @@ export default class AppPickerSelectView extends Vue {
} }
}); });
} }
}
let _viewparam = JSON.parse(this.viewparam); let _viewparam = JSON.parse(this.viewparam);
_viewparam.selectedData = this.selectItems; _viewparam.selectedData = this.selectItems;
this.viewparam = JSON.stringify(_viewparam); this.viewparam = JSON.stringify(_viewparam);
...@@ -376,23 +384,31 @@ export default class AppPickerSelectView extends Vue { ...@@ -376,23 +384,31 @@ export default class AppPickerSelectView extends Vue {
this.$emit('formitemvaluechange', { name: this.valueitem, value: tempvalue }); this.$emit('formitemvaluechange', { name: this.valueitem, value: tempvalue });
} }
if (this.name) { if (this.name) {
let tempvalue = $event[0][this.deMajorField] ? $event[0][this.deMajorField] : $event[0].srfmajortext; let temptext = $event[0][this.deMajorField] ? $event[0][this.deMajorField] : $event[0].srfmajortext;
this.$emit('formitemvaluechange', { name: this.name, value: tempvalue }); this.$emit('formitemvaluechange', { name: this.name, value: temptext });
} }
}else{ }else{
let selects: Array<any> = []; let tempvalue: string = '';
let temptext: string = '';
if ($event && Array.isArray($event)) { if ($event && Array.isArray($event)) {
$event.forEach((select: any) => { $event.forEach((select: any) => {
selects.push({ srfkey: select.srfkey, srfmajortext: select.srfmajortext }); let srfkey = select[this.deKeyField] ? select[this.deKeyField] : select.srfkey;
let index = this.items.findIndex((item) => Object.is(item.srfkey, select.srfkey)); tempvalue += srfkey+",";
let srfmajortext = select[this.deMajorField] ? select[this.deMajorField] : select.srfmajortext;
temptext += srfmajortext+",";
let index = this.items.findIndex((item) => Object.is(item.srfkey, srfkey));
if (index < 0) { if (index < 0) {
this.items.push({ srfmajortext : select.srfmajortext, srfkey: select.srfkey }); this.items.push({ srfmajortext : srfmajortext, srfkey: srfkey });
} }
}); });
} }
tempvalue = tempvalue.substring(0,tempvalue.length-1);
temptext = temptext.substring(0,temptext.length-1);
if(this.valueitem){
this.$emit('formitemvaluechange',{ name: this.valueitem, value: tempvalue });
}
if (this.name) { if (this.name) {
let value = selects.length > 0 ? JSON.stringify(selects) : ''; this.$emit('formitemvaluechange', { name: this.name, value: temptext });
this.$emit('formitemvaluechange', { name: this.name, value: value });
} }
} }
} }
...@@ -553,8 +569,18 @@ export default class AppPickerSelectView extends Vue { ...@@ -553,8 +569,18 @@ export default class AppPickerSelectView extends Vue {
} }
}); });
} }
let value = val.length > 0 ? JSON.stringify(val) : ''; let tempvalue: string = '';
this.$emit('formitemvaluechange', { name: this.name, value: value }); let temptext: string = '';
val.forEach((select: any)=>{
let srfkey = select[this.deKeyField] ? select[this.deKeyField] : select.srfkey;
tempvalue += srfkey+",";
let srfmajortext = select[this.deMajorField] ? select[this.deMajorField] : select.srfmajortext;
temptext += srfmajortext+",";
});
tempvalue = tempvalue.substring(0,tempvalue.length-1);
temptext = temptext.substring(0,temptext.length-1);
this.$emit('formitemvaluechange',{ name: this.valueitem, value: tempvalue });
this.$emit('formitemvaluechange', { name: this.name, value: temptext });
} }
} }
......
...@@ -41,6 +41,8 @@ export default { ...@@ -41,6 +41,8 @@ export default {
modelenable: "模型是否启用", modelenable: "模型是否启用",
bpmnfile: "BPMN", bpmnfile: "BPMN",
md5check: "校验", md5check: "校验",
webserviceids: "WebServiceIds",
mobileserviceids: "MobileServiceIds",
}, },
uiactions: { uiactions: {
}, },
......
...@@ -40,6 +40,8 @@ export default { ...@@ -40,6 +40,8 @@ export default {
modelenable: "模型是否启用", modelenable: "模型是否启用",
bpmnfile: "BPMN", bpmnfile: "BPMN",
md5check: "校验", md5check: "校验",
webserviceids: "WebServiceIds",
mobileserviceids: "MobileServiceIds",
}, },
uiactions: { uiactions: {
}, },
......
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
:showBusyIndicator="true" :showBusyIndicator="true"
:isOpenEdit="false" :isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode" :gridRowActiveMode="gridRowActiveMode"
:isformDruipart="isformDruipart"
@save="onSave" @save="onSave"
updateAction="" updateAction=""
removeAction="Remove" removeAction="Remove"
......
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
:showBusyIndicator="true" :showBusyIndicator="true"
:isOpenEdit="false" :isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode" :gridRowActiveMode="gridRowActiveMode"
:isformDruipart="isformDruipart"
@save="onSave" @save="onSave"
updateAction="" updateAction=""
removeAction="Remove" removeAction="Remove"
......
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
:showBusyIndicator="true" :showBusyIndicator="true"
:isOpenEdit="false" :isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode" :gridRowActiveMode="gridRowActiveMode"
:isformDruipart="isformDruipart"
@save="onSave" @save="onSave"
updateAction="" updateAction=""
removeAction="Remove" removeAction="Remove"
......
...@@ -98,6 +98,7 @@ ...@@ -98,6 +98,7 @@
:showBusyIndicator="true" :showBusyIndicator="true"
:isOpenEdit="false" :isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode" :gridRowActiveMode="gridRowActiveMode"
:isformDruipart="isformDruipart"
@save="onSave" @save="onSave"
updateAction="" updateAction=""
removeAction="Remove" removeAction="Remove"
......
...@@ -119,6 +119,7 @@ ...@@ -119,6 +119,7 @@
:showBusyIndicator="true" :showBusyIndicator="true"
:isOpenEdit="false" :isOpenEdit="false"
:gridRowActiveMode="gridRowActiveMode" :gridRowActiveMode="gridRowActiveMode"
:isformDruipart="isformDruipart"
@save="onSave" @save="onSave"
updateAction="" updateAction=""
removeAction="Remove" removeAction="Remove"
......
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
> .ivu-card-body { > .ivu-card-body {
// height: 50%; // height: 50%;
// flex-grow: 1; // flex-grow: 1;
height: calc(100% - 62px); height: calc(100% - 74px);
padding: 0px; padding: 0px;
> .content-container { > .content-container {
height: 100%; height: 100%;
......
...@@ -363,11 +363,12 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -363,11 +363,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
* *
* @public * @public
* @param {*} [data={}] * @param {*} [data={}]
* @param {string} [action]
* @memberof DefaultBase * @memberof DefaultBase
*/ */
public onFormLoad(data: any = {}): void { public onFormLoad(data: any = {},action:string): void {
this.setFormEnableCond(data); this.setFormEnableCond(data);
this.fillForm(data); this.fillForm(data,action);
this.formLogic({ name: '', newVal: null, oldVal: null }); this.formLogic({ name: '', newVal: null, oldVal: null });
} }
...@@ -375,15 +376,19 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -375,15 +376,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
* 值填充 * 值填充
* *
* @param {*} [_datas={}] * @param {*} [_datas={}]
* @param {string} [action]
* @memberof DefaultBase * @memberof DefaultBase
*/ */
public fillForm(_datas: any = {}): void { public fillForm(_datas: any = {},action:string): void {
this.ignorefieldvaluechange = true; this.ignorefieldvaluechange = true;
Object.keys(_datas).forEach((name: string) => { Object.keys(_datas).forEach((name: string) => {
if (this.data.hasOwnProperty(name)) { if (this.data.hasOwnProperty(name)) {
this.data[name] = _datas[name]; this.data[name] = _datas[name];
} }
}); });
if(Object.is(action,'loadDraft')){
this.createDefault();
}
this.$nextTick(function () { this.$nextTick(function () {
this.ignorefieldvaluechange = false; this.ignorefieldvaluechange = false;
}) })
...@@ -406,6 +411,13 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -406,6 +411,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
}); });
} }
/**
* 新建默认值
* @memberof DefaultBase
*/
public createDefault(){
}
/** /**
* 重置草稿表单状态 * 重置草稿表单状态
* *
...@@ -622,7 +634,6 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -622,7 +634,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
get.then((response: any) => { get.then((response: any) => {
if (response && response.status === 200) { if (response && response.status === 200) {
const data = response.data; const data = response.data;
this.onFormLoad(data);
this.$emit('load', data); this.$emit('load', data);
this.$nextTick(() => { this.$nextTick(() => {
this.formState.next({ type: 'load', data: data }); this.formState.next({ type: 'load', data: data });
...@@ -666,7 +677,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -666,7 +677,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
const data = response.data; const data = response.data;
this.resetDraftFormStates(); this.resetDraftFormStates();
this.onFormLoad(data); this.onFormLoad(data,'loadDraft');
setTimeout(() => { setTimeout(() => {
const form: any = this.$refs.form; const form: any = this.$refs.form;
if (form) { if (form) {
......
...@@ -309,6 +309,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -309,6 +309,14 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
@Prop() public opendata: any; @Prop() public opendata: any;
/**
* 是否嵌入关系界面
*
* @type {boolean}
* @memberof MainBase
*/
@Prop({default:false}) public isformDruipart?: boolean;
/** /**
* 显示处理提示 * 显示处理提示
* *
...@@ -1477,7 +1485,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1477,7 +1485,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
this.$emit('save', successItems); this.$emit('save', successItems);
this.refresh([]); this.refresh([]);
if(errorItems.length === 0){ if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) }); this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
}else{ }else{
errorItems.forEach((item:any,index:number)=>{ errorItems.forEach((item:any,index:number)=>{
......
...@@ -363,11 +363,12 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -363,11 +363,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
* *
* @public * @public
* @param {*} [data={}] * @param {*} [data={}]
* @param {string} [action]
* @memberof DefaultBase * @memberof DefaultBase
*/ */
public onFormLoad(data: any = {}): void { public onFormLoad(data: any = {},action:string): void {
this.setFormEnableCond(data); this.setFormEnableCond(data);
this.fillForm(data); this.fillForm(data,action);
this.formLogic({ name: '', newVal: null, oldVal: null }); this.formLogic({ name: '', newVal: null, oldVal: null });
} }
...@@ -375,15 +376,19 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -375,15 +376,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
* 值填充 * 值填充
* *
* @param {*} [_datas={}] * @param {*} [_datas={}]
* @param {string} [action]
* @memberof DefaultBase * @memberof DefaultBase
*/ */
public fillForm(_datas: any = {}): void { public fillForm(_datas: any = {},action:string): void {
this.ignorefieldvaluechange = true; this.ignorefieldvaluechange = true;
Object.keys(_datas).forEach((name: string) => { Object.keys(_datas).forEach((name: string) => {
if (this.data.hasOwnProperty(name)) { if (this.data.hasOwnProperty(name)) {
this.data[name] = _datas[name]; this.data[name] = _datas[name];
} }
}); });
if(Object.is(action,'loadDraft')){
this.createDefault();
}
this.$nextTick(function () { this.$nextTick(function () {
this.ignorefieldvaluechange = false; this.ignorefieldvaluechange = false;
}) })
...@@ -406,6 +411,13 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -406,6 +411,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
}); });
} }
/**
* 新建默认值
* @memberof DefaultBase
*/
public createDefault(){
}
/** /**
* 重置草稿表单状态 * 重置草稿表单状态
* *
...@@ -622,7 +634,6 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -622,7 +634,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
get.then((response: any) => { get.then((response: any) => {
if (response && response.status === 200) { if (response && response.status === 200) {
const data = response.data; const data = response.data;
this.onFormLoad(data);
this.$emit('load', data); this.$emit('load', data);
this.$nextTick(() => { this.$nextTick(() => {
this.formState.next({ type: 'load', data: data }); this.formState.next({ type: 'load', data: data });
...@@ -666,7 +677,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -666,7 +677,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
const data = response.data; const data = response.data;
this.resetDraftFormStates(); this.resetDraftFormStates();
this.onFormLoad(data); this.onFormLoad(data,'loadDraft');
setTimeout(() => { setTimeout(() => {
const form: any = this.$refs.form; const form: any = this.$refs.form;
if (form) { if (form) {
......
...@@ -321,6 +321,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -321,6 +321,14 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
@Prop() public opendata: any; @Prop() public opendata: any;
/**
* 是否嵌入关系界面
*
* @type {boolean}
* @memberof MainBase
*/
@Prop({default:false}) public isformDruipart?: boolean;
/** /**
* 显示处理提示 * 显示处理提示
* *
...@@ -1497,7 +1505,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1497,7 +1505,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
this.$emit('save', successItems); this.$emit('save', successItems);
this.refresh([]); this.refresh([]);
if(errorItems.length === 0){ if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) }); this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
}else{ }else{
errorItems.forEach((item:any,index:number)=>{ errorItems.forEach((item:any,index:number)=>{
......
...@@ -399,11 +399,12 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -399,11 +399,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
* *
* @public * @public
* @param {*} [data={}] * @param {*} [data={}]
* @param {string} [action]
* @memberof DefaultBase * @memberof DefaultBase
*/ */
public onFormLoad(data: any = {}): void { public onFormLoad(data: any = {},action:string): void {
this.setFormEnableCond(data); this.setFormEnableCond(data);
this.fillForm(data); this.fillForm(data,action);
this.formLogic({ name: '', newVal: null, oldVal: null }); this.formLogic({ name: '', newVal: null, oldVal: null });
} }
...@@ -411,15 +412,19 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -411,15 +412,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
* 值填充 * 值填充
* *
* @param {*} [_datas={}] * @param {*} [_datas={}]
* @param {string} [action]
* @memberof DefaultBase * @memberof DefaultBase
*/ */
public fillForm(_datas: any = {}): void { public fillForm(_datas: any = {},action:string): void {
this.ignorefieldvaluechange = true; this.ignorefieldvaluechange = true;
Object.keys(_datas).forEach((name: string) => { Object.keys(_datas).forEach((name: string) => {
if (this.data.hasOwnProperty(name)) { if (this.data.hasOwnProperty(name)) {
this.data[name] = _datas[name]; this.data[name] = _datas[name];
} }
}); });
if(Object.is(action,'loadDraft')){
this.createDefault();
}
this.$nextTick(function () { this.$nextTick(function () {
this.ignorefieldvaluechange = false; this.ignorefieldvaluechange = false;
}) })
...@@ -442,6 +447,13 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -442,6 +447,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
}); });
} }
/**
* 新建默认值
* @memberof DefaultBase
*/
public createDefault(){
}
/** /**
* 重置草稿表单状态 * 重置草稿表单状态
* *
...@@ -658,7 +670,6 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -658,7 +670,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
get.then((response: any) => { get.then((response: any) => {
if (response && response.status === 200) { if (response && response.status === 200) {
const data = response.data; const data = response.data;
this.onFormLoad(data);
this.$emit('load', data); this.$emit('load', data);
this.$nextTick(() => { this.$nextTick(() => {
this.formState.next({ type: 'load', data: data }); this.formState.next({ type: 'load', data: data });
...@@ -702,7 +713,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -702,7 +713,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
const data = response.data; const data = response.data;
this.resetDraftFormStates(); this.resetDraftFormStates();
this.onFormLoad(data); this.onFormLoad(data,'loadDraft');
setTimeout(() => { setTimeout(() => {
const form: any = this.$refs.form; const form: any = this.$refs.form;
if (form) { if (form) {
......
...@@ -103,6 +103,34 @@ ...@@ -103,6 +103,34 @@
</app-form-item> </app-form-item>
</i-col>
<i-col v-show="detailsModel.webserviceids.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='webserviceids' :itemRules="this.rules().webserviceids" class='' :caption="$t('entities.wfprocessdefinition.main_form.details.webserviceids')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.webserviceids.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.webserviceids"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.webserviceids.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.mobileserviceids.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='mobileserviceids' :itemRules="this.rules().mobileserviceids" class='' :caption="$t('entities.wfprocessdefinition.main_form.details.mobileserviceids')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.mobileserviceids.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.mobileserviceids"
@enter="onEnter($event)"
unit=""
:disabled="detailsModel.mobileserviceids.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col> </i-col>
</row> </row>
...@@ -455,6 +483,8 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -455,6 +483,8 @@ export default class MainBase extends Vue implements ControlInterface {
modelenable: null, modelenable: null,
bpmnfile: null, bpmnfile: null,
md5check: null, md5check: null,
webserviceids: null,
mobileserviceids: null,
wfprocessdefinition:null, wfprocessdefinition:null,
}; };
...@@ -588,6 +618,18 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -588,6 +618,18 @@ export default class MainBase extends Vue implements ControlInterface {
{ required: false, type: 'string', message: '校验 值不能为空', trigger: 'change' }, { required: false, type: 'string', message: '校验 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '校验 值不能为空', trigger: 'blur' }, { required: false, type: 'string', message: '校验 值不能为空', trigger: 'blur' },
], ],
webserviceids: [
{ type: 'string', message: 'WebServiceIds 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: 'WebServiceIds 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: 'WebServiceIds 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: 'WebServiceIds 值不能为空', trigger: 'blur' },
],
mobileserviceids: [
{ type: 'string', message: 'MobileServiceIds 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: 'MobileServiceIds 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: 'MobileServiceIds 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: 'MobileServiceIds 值不能为空', trigger: 'blur' },
],
} }
} }
...@@ -709,6 +751,10 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -709,6 +751,10 @@ export default class MainBase extends Vue implements ControlInterface {
bpmnfile: new FormItemModel({ caption: 'BPMN', detailType: 'FORMITEM', name: 'bpmnfile', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 }) bpmnfile: new FormItemModel({ caption: 'BPMN', detailType: 'FORMITEM', name: 'bpmnfile', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
, ,
md5check: new FormItemModel({ caption: '校验', detailType: 'FORMITEM', name: 'md5check', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 }) md5check: new FormItemModel({ caption: '校验', detailType: 'FORMITEM', name: 'md5check', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
webserviceids: new FormItemModel({ caption: 'WebServiceIds', detailType: 'FORMITEM', name: 'webserviceids', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
,
mobileserviceids: new FormItemModel({ caption: 'MobileServiceIds', detailType: 'FORMITEM', name: 'mobileserviceids', visible: true, isShowCaption: true, form: this, isControlledContent: false , disabled: false, enableCond: 3 })
, ,
}; };
...@@ -892,6 +938,30 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -892,6 +938,30 @@ export default class MainBase extends Vue implements ControlInterface {
this.formDataChange({ name: 'md5check', newVal: newVal, oldVal: oldVal }); this.formDataChange({ name: 'md5check', newVal: newVal, oldVal: oldVal });
} }
/**
* 监控表单属性 webserviceids 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.webserviceids')
onWebserviceidsChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'webserviceids', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 mobileserviceids 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof MainBase
*/
@Watch('data.mobileserviceids')
onMobileserviceidsChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'mobileserviceids', newVal: newVal, oldVal: oldVal });
}
/** /**
* 显示更多模式切换操作 * 显示更多模式切换操作
...@@ -963,6 +1033,8 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -963,6 +1033,8 @@ export default class MainBase extends Vue implements ControlInterface {
} }
/** /**
......
...@@ -90,6 +90,16 @@ export default class MainModel { ...@@ -90,6 +90,16 @@ export default class MainModel {
prop: 'md5check', prop: 'md5check',
dataType: 'TEXT', dataType: 'TEXT',
}, },
{
name: 'webserviceids',
prop: 'webserviceids',
dataType: 'TEXT',
},
{
name: 'mobileserviceids',
prop: 'mobileserviceids',
dataType: 'TEXT',
},
{ {
name: 'wfprocessdefinition', name: 'wfprocessdefinition',
prop: 'definitionkey', prop: 'definitionkey',
......
...@@ -335,6 +335,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -335,6 +335,14 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
@Prop() public opendata: any; @Prop() public opendata: any;
/**
* 是否嵌入关系界面
*
* @type {boolean}
* @memberof MainBase
*/
@Prop({default:false}) public isformDruipart?: boolean;
/** /**
* 显示处理提示 * 显示处理提示
* *
...@@ -1527,7 +1535,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1527,7 +1535,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
this.$emit('save', successItems); this.$emit('save', successItems);
this.refresh([]); this.refresh([]);
if(errorItems.length === 0){ if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) }); this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
}else{ }else{
errorItems.forEach((item:any,index:number)=>{ errorItems.forEach((item:any,index:number)=>{
......
...@@ -477,11 +477,12 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -477,11 +477,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
* *
* @public * @public
* @param {*} [data={}] * @param {*} [data={}]
* @param {string} [action]
* @memberof DefaultBase * @memberof DefaultBase
*/ */
public onFormLoad(data: any = {}): void { public onFormLoad(data: any = {},action:string): void {
this.setFormEnableCond(data); this.setFormEnableCond(data);
this.fillForm(data); this.fillForm(data,action);
this.formLogic({ name: '', newVal: null, oldVal: null }); this.formLogic({ name: '', newVal: null, oldVal: null });
} }
...@@ -489,15 +490,19 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -489,15 +490,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
* 值填充 * 值填充
* *
* @param {*} [_datas={}] * @param {*} [_datas={}]
* @param {string} [action]
* @memberof DefaultBase * @memberof DefaultBase
*/ */
public fillForm(_datas: any = {}): void { public fillForm(_datas: any = {},action:string): void {
this.ignorefieldvaluechange = true; this.ignorefieldvaluechange = true;
Object.keys(_datas).forEach((name: string) => { Object.keys(_datas).forEach((name: string) => {
if (this.data.hasOwnProperty(name)) { if (this.data.hasOwnProperty(name)) {
this.data[name] = _datas[name]; this.data[name] = _datas[name];
} }
}); });
if(Object.is(action,'loadDraft')){
this.createDefault();
}
this.$nextTick(function () { this.$nextTick(function () {
this.ignorefieldvaluechange = false; this.ignorefieldvaluechange = false;
}) })
...@@ -520,6 +525,13 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -520,6 +525,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
}); });
} }
/**
* 新建默认值
* @memberof DefaultBase
*/
public createDefault(){
}
/** /**
* 重置草稿表单状态 * 重置草稿表单状态
* *
...@@ -736,7 +748,6 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -736,7 +748,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
get.then((response: any) => { get.then((response: any) => {
if (response && response.status === 200) { if (response && response.status === 200) {
const data = response.data; const data = response.data;
this.onFormLoad(data);
this.$emit('load', data); this.$emit('load', data);
this.$nextTick(() => { this.$nextTick(() => {
this.formState.next({ type: 'load', data: data }); this.formState.next({ type: 'load', data: data });
...@@ -780,7 +791,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -780,7 +791,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
const data = response.data; const data = response.data;
this.resetDraftFormStates(); this.resetDraftFormStates();
this.onFormLoad(data); this.onFormLoad(data,'loadDraft');
setTimeout(() => { setTimeout(() => {
const form: any = this.$refs.form; const form: any = this.$refs.form;
if (form) { if (form) {
......
...@@ -386,6 +386,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -386,6 +386,14 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
@Prop() public opendata: any; @Prop() public opendata: any;
/**
* 是否嵌入关系界面
*
* @type {boolean}
* @memberof MainBase
*/
@Prop({default:false}) public isformDruipart?: boolean;
/** /**
* 显示处理提示 * 显示处理提示
* *
...@@ -1610,7 +1618,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1610,7 +1618,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
this.$emit('save', successItems); this.$emit('save', successItems);
this.refresh([]); this.refresh([]);
if(errorItems.length === 0){ if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) }); this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
}else{ }else{
errorItems.forEach((item:any,index:number)=>{ errorItems.forEach((item:any,index:number)=>{
......
...@@ -363,11 +363,12 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -363,11 +363,12 @@ export default class DefaultBase extends Vue implements ControlInterface {
* *
* @public * @public
* @param {*} [data={}] * @param {*} [data={}]
* @param {string} [action]
* @memberof DefaultBase * @memberof DefaultBase
*/ */
public onFormLoad(data: any = {}): void { public onFormLoad(data: any = {},action:string): void {
this.setFormEnableCond(data); this.setFormEnableCond(data);
this.fillForm(data); this.fillForm(data,action);
this.formLogic({ name: '', newVal: null, oldVal: null }); this.formLogic({ name: '', newVal: null, oldVal: null });
} }
...@@ -375,15 +376,19 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -375,15 +376,19 @@ export default class DefaultBase extends Vue implements ControlInterface {
* 值填充 * 值填充
* *
* @param {*} [_datas={}] * @param {*} [_datas={}]
* @param {string} [action]
* @memberof DefaultBase * @memberof DefaultBase
*/ */
public fillForm(_datas: any = {}): void { public fillForm(_datas: any = {},action:string): void {
this.ignorefieldvaluechange = true; this.ignorefieldvaluechange = true;
Object.keys(_datas).forEach((name: string) => { Object.keys(_datas).forEach((name: string) => {
if (this.data.hasOwnProperty(name)) { if (this.data.hasOwnProperty(name)) {
this.data[name] = _datas[name]; this.data[name] = _datas[name];
} }
}); });
if(Object.is(action,'loadDraft')){
this.createDefault();
}
this.$nextTick(function () { this.$nextTick(function () {
this.ignorefieldvaluechange = false; this.ignorefieldvaluechange = false;
}) })
...@@ -406,6 +411,13 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -406,6 +411,13 @@ export default class DefaultBase extends Vue implements ControlInterface {
}); });
} }
/**
* 新建默认值
* @memberof DefaultBase
*/
public createDefault(){
}
/** /**
* 重置草稿表单状态 * 重置草稿表单状态
* *
...@@ -622,7 +634,6 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -622,7 +634,6 @@ export default class DefaultBase extends Vue implements ControlInterface {
get.then((response: any) => { get.then((response: any) => {
if (response && response.status === 200) { if (response && response.status === 200) {
const data = response.data; const data = response.data;
this.onFormLoad(data);
this.$emit('load', data); this.$emit('load', data);
this.$nextTick(() => { this.$nextTick(() => {
this.formState.next({ type: 'load', data: data }); this.formState.next({ type: 'load', data: data });
...@@ -666,7 +677,7 @@ export default class DefaultBase extends Vue implements ControlInterface { ...@@ -666,7 +677,7 @@ export default class DefaultBase extends Vue implements ControlInterface {
const data = response.data; const data = response.data;
this.resetDraftFormStates(); this.resetDraftFormStates();
this.onFormLoad(data); this.onFormLoad(data,'loadDraft');
setTimeout(() => { setTimeout(() => {
const form: any = this.$refs.form; const form: any = this.$refs.form;
if (form) { if (form) {
......
...@@ -333,6 +333,14 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -333,6 +333,14 @@ export default class MainBase extends Vue implements ControlInterface {
*/ */
@Prop() public opendata: any; @Prop() public opendata: any;
/**
* 是否嵌入关系界面
*
* @type {boolean}
* @memberof MainBase
*/
@Prop({default:false}) public isformDruipart?: boolean;
/** /**
* 显示处理提示 * 显示处理提示
* *
...@@ -1517,7 +1525,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1517,7 +1525,7 @@ export default class MainBase extends Vue implements ControlInterface {
} }
this.$emit('save', successItems); this.$emit('save', successItems);
this.refresh([]); this.refresh([]);
if(errorItems.length === 0){ if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) }); this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
}else{ }else{
errorItems.forEach((item:any,index:number)=>{ errorItems.forEach((item:any,index:number)=>{
......
...@@ -37,11 +37,6 @@ ...@@ -37,11 +37,6 @@
git clone -b master $para2 ibzwf/ git clone -b master $para2 ibzwf/
export NODE_OPTIONS=--max-old-space-size=4096 export NODE_OPTIONS=--max-old-space-size=4096
cd ibzwf/ cd ibzwf/
mvn clean package -Papi
cd ibzwf-provider/ibzwf-provider-api
mvn -Papi docker:build
mvn -Papi docker:push
docker -H $para1 stack deploy --compose-file=src/main/docker/ibzwf-provider-api.yaml ibzlab-rt --with-registry-auth
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ ...@@ -12,6 +12,6 @@ CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \
sleep ${IBIZ_SLEEP} && \ sleep ${IBIZ_SLEEP} && \
java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-provider-api.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-provider-api.jar
EXPOSE 40003 EXPOSE 8081
ADD ibzwf-provider-api.jar /ibzwf-provider-api.jar ADD ibzwf-provider-api.jar /ibzwf-provider-api.jar
...@@ -3,22 +3,9 @@ services: ...@@ -3,22 +3,9 @@ services:
ibzwf-provider-api: ibzwf-provider-api:
image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-provider-api:latest image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-provider-api:latest
ports: ports:
- "40003:40003" - "8081:8081"
networks: networks:
- agent_network - agent_network
environment:
- SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
- SERVER_PORT=40003
- SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
- SPRING_REDIS_HOST=172.16.100.243
- SPRING_REDIS_PORT=6379
- SPRING_REDIS_DATABASE=0
- SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
- SPRING_DATASOURCE_PASSWORD=@6dEfb3@
- SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
- SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
- SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
- NACOS=172.16.102.211:8848
deploy: deploy:
resources: resources:
limits: limits:
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册