提交 1b48e217 编写于 作者: ibizdev's avatar ibizdev

ibiz4j 发布系统代码

上级 210c027e
...@@ -40,6 +40,14 @@ export default class AppFormDRUIPart extends Vue { ...@@ -40,6 +40,14 @@ export default class AppFormDRUIPart extends Vue {
*/ */
@Prop() public viewname?: string; @Prop() public viewname?: string;
/**
* 临时数据模式:从数据模式:"2"、主数据模式:"1"、无临时数据模式:"0"
*
* @type {string}
* @memberof AppFormDRUIPart
*/
@Prop({default:"0"}) public tempMode?:string;
/** /**
* 刷新关系项 * 刷新关系项
* *
...@@ -285,11 +293,16 @@ export default class AppFormDRUIPart extends Vue { ...@@ -285,11 +293,16 @@ export default class AppFormDRUIPart extends Vue {
} }
this.viewparam = JSON.stringify(tempParam); this.viewparam = JSON.stringify(tempParam);
if (this.isRelationalData) { if (this.isRelationalData) {
if (!_paramitem || _paramitem == null || Object.is(_paramitem, '')) { // 从数据模式无遮罩层
this.blockUIStart(); if(this.tempMode && Object.is(this.tempMode,"2")){
return;
} else {
this.blockUIStop(); this.blockUIStop();
}else{
if (!_paramitem || _paramitem == null || Object.is(_paramitem, '')) {
this.blockUIStart();
return;
} else {
this.blockUIStop();
}
} }
} }
if(!this.isForbidLoad){ if(!this.isForbidLoad){
...@@ -319,8 +332,17 @@ export default class AppFormDRUIPart extends Vue { ...@@ -319,8 +332,17 @@ export default class AppFormDRUIPart extends Vue {
} }
// 表单保存之前 // 表单保存之前
if (Object.is($event.type, 'beforesave')) { if (Object.is($event.type, 'beforesave')) {
if(Object.is(this.refviewtype,'DEMEDITVIEW9') || Object.is(this.refviewtype,'DEGRIDVIEW9')){ if(Object.is(this.refviewtype,'DEMEDITVIEW9') || Object.is(this.refviewtype,'DEGRIDVIEW9') || Object.is(this.refviewtype,'DEGRIDVIEW')){
this.formDruipart.next({action:'save',data:$event.data}); // 从数据模式直接通知保存
if(this.tempMode && Object.is(this.tempMode,"2")){
this.formDruipart.next({action:'save',data:$event.data});
}else{
if($event.data && !Object.is($event.data.srfuf,"0")){
this.formDruipart.next({action:'save',data:$event.data});
}else{
this.$emit('drdatasaved',$event);
}
}
} else { } else {
// 不需要保存的界面也要抛出事件,供计数器计算 // 不需要保存的界面也要抛出事件,供计数器计算
this.$emit('drdatasaved',$event); this.$emit('drdatasaved',$event);
......
...@@ -176,6 +176,15 @@ export default class AppPicker extends Vue { ...@@ -176,6 +176,15 @@ export default class AppPicker extends Vue {
*/ */
@Prop() public valueitem!: string; @Prop() public valueitem!: string;
/**
* 排序
*
* @type {string}
* @memberof AppPicker
*/
@Prop() public sort?: string;
/** /**
* 值 * 值
* *
...@@ -320,6 +329,9 @@ export default class AppPicker extends Vue { ...@@ -320,6 +329,9 @@ export default class AppPicker extends Vue {
query = ''; query = '';
} }
this.inputState = false; this.inputState = false;
if(this.sort && !Object.is(this.sort, "")) {
Object.assign(_param, { sort: this.sort });
}
Object.assign(_param, { query: query }); Object.assign(_param, { query: query });
// 错误信息国际化 // 错误信息国际化
let error: string = (this.$t('components.appPicker.error') as any); let error: string = (this.$t('components.appPicker.error') as any);
......
...@@ -1545,6 +1545,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1545,6 +1545,7 @@ export default class MainBase extends Vue implements ControlInterface {
const data = response.data; const data = response.data;
this.resetDraftFormStates(); this.resetDraftFormStates();
this.onFormLoad(data,'loadDraft'); this.onFormLoad(data,'loadDraft');
data.jobsinfo = null;
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 });
...@@ -1648,8 +1649,8 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1648,8 +1649,8 @@ export default class MainBase extends Vue implements ControlInterface {
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
const data = this.getValues(); const data = this.getValues();
Object.assign(arg, data);
Object.assign(arg, this.context); Object.assign(arg, this.context);
Object.assign(arg, data);
if (ifStateNext) { if (ifStateNext) {
this.drcounter = 0; this.drcounter = 0;
if(this.drcounter !== 0){ if(this.drcounter !== 0){
......
...@@ -1385,6 +1385,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1385,6 +1385,7 @@ export default class MainBase extends Vue implements ControlInterface {
const data = response.data; const data = response.data;
this.resetDraftFormStates(); this.resetDraftFormStates();
this.onFormLoad(data,'loadDraft'); this.onFormLoad(data,'loadDraft');
data.jobslog = null;
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 });
...@@ -1488,8 +1489,8 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1488,8 +1489,8 @@ export default class MainBase extends Vue implements ControlInterface {
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
const data = this.getValues(); const data = this.getValues();
Object.assign(arg, data);
Object.assign(arg, this.context); Object.assign(arg, this.context);
Object.assign(arg, data);
if (ifStateNext) { if (ifStateNext) {
this.drcounter = 0; this.drcounter = 0;
if(this.drcounter !== 0){ if(this.drcounter !== 0){
......
...@@ -1220,6 +1220,7 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1220,6 +1220,7 @@ export default class MainBase extends Vue implements ControlInterface {
const data = response.data; const data = response.data;
this.resetDraftFormStates(); this.resetDraftFormStates();
this.onFormLoad(data,'loadDraft'); this.onFormLoad(data,'loadDraft');
data.jobsregistry = null;
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 });
...@@ -1323,8 +1324,8 @@ export default class MainBase extends Vue implements ControlInterface { ...@@ -1323,8 +1324,8 @@ export default class MainBase extends Vue implements ControlInterface {
} }
const arg: any = { ...opt }; const arg: any = { ...opt };
const data = this.getValues(); const data = this.getValues();
Object.assign(arg, data);
Object.assign(arg, this.context); Object.assign(arg, this.context);
Object.assign(arg, data);
if (ifStateNext) { if (ifStateNext) {
this.drcounter = 0; this.drcounter = 0;
if(this.drcounter !== 0){ if(this.drcounter !== 0){
......
FROM openjdk:8-jre-alpine FROM openjdk:8-jre-alpine
ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \ ENV TZ=Asia/Shanghai \
SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
IBIZ_SLEEP=0 \ IBIZ_SLEEP=0 \
JAVA_OPTS="" JAVA_OPTS=""
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ 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 /ibztask-app-web.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibztask-app-web.jar
......
FROM openjdk:8-jre-alpine FROM openjdk:8-jre-alpine
ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \ ENV TZ=Asia/Shanghai \
SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
IBIZ_SLEEP=0 \ IBIZ_SLEEP=0 \
JAVA_OPTS="" JAVA_OPTS=""
RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
CMD echo "The application will start in ${IBIZ_SLEEP}s..." && \ 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 /ibztask-provider-api.jar java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibztask-provider-api.jar
......
...@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.JobsInfoDTO; ...@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.JobsInfoDTO;
import cn.ibizlab.util.domain.MappingBase; import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {}, @Mapper(componentModel = "spring", uses = {},implementationName="apiJobsInfoMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface JobsInfoMapping extends MappingBase<JobsInfoDTO, JobsInfo> { public interface JobsInfoMapping extends MappingBase<JobsInfoDTO, JobsInfo> {
......
...@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.JobsLockDTO; ...@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.JobsLockDTO;
import cn.ibizlab.util.domain.MappingBase; import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {}, @Mapper(componentModel = "spring", uses = {},implementationName="apiJobsLockMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface JobsLockMapping extends MappingBase<JobsLockDTO, JobsLock> { public interface JobsLockMapping extends MappingBase<JobsLockDTO, JobsLock> {
......
...@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.JobsLogDTO; ...@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.JobsLogDTO;
import cn.ibizlab.util.domain.MappingBase; import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {}, @Mapper(componentModel = "spring", uses = {},implementationName="apiJobsLogMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface JobsLogMapping extends MappingBase<JobsLogDTO, JobsLog> { public interface JobsLogMapping extends MappingBase<JobsLogDTO, JobsLog> {
......
...@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.JobsRegistryDTO; ...@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.JobsRegistryDTO;
import cn.ibizlab.util.domain.MappingBase; import cn.ibizlab.util.domain.MappingBase;
import org.mapstruct.factory.Mappers; import org.mapstruct.factory.Mappers;
@Mapper(componentModel = "spring", uses = {}, @Mapper(componentModel = "spring", uses = {},implementationName="apiJobsRegistryMapping",
nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE, nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS) nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
public interface JobsRegistryMapping extends MappingBase<JobsRegistryDTO, JobsRegistry> { public interface JobsRegistryMapping extends MappingBase<JobsRegistryDTO, JobsRegistry> {
......
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册