ibiz4j 发布系统代码

app_web/src/components/app-form-druipart/app-form-druipart.vue

@@ -40,6 +40,14 @@ export default class AppFormDRUIPart extends Vue {
      */
     @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 {
         }
         this.viewparam = JSON.stringify(tempParam);
         if (this.isRelationalData) {
-            if (!_paramitem || _paramitem == null || Object.is(_paramitem, '')) {
-                this.blockUIStart();
-                return;
-            } else {
+            // 从数据模式无遮罩层
+            if(this.tempMode && Object.is(this.tempMode,"2")){
                 this.blockUIStop();
+            }else{
+                if (!_paramitem || _paramitem == null || Object.is(_paramitem, '')) {
+                    this.blockUIStart();
+                    return;
+                } else {
+                    this.blockUIStop();
+                }
             }
         }
         if(!this.isForbidLoad){
@@ -319,8 +332,17 @@ export default class AppFormDRUIPart extends Vue {
             }
              // 表单保存之前
             if (Object.is($event.type, 'beforesave')) {
-                if(Object.is(this.refviewtype,'DEMEDITVIEW9') || Object.is(this.refviewtype,'DEGRIDVIEW9')){
-                    this.formDruipart.next({action:'save',data:$event.data});
+                if(Object.is(this.refviewtype,'DEMEDITVIEW9') || Object.is(this.refviewtype,'DEGRIDVIEW9') || Object.is(this.refviewtype,'DEGRIDVIEW')){
+                   // 从数据模式直接通知保存
+                   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 {
                     // 不需要保存的界面也要抛出事件，供计数器计算
                     this.$emit('drdatasaved',$event);

app_web/src/widgets/wfgroup/main-form/main-form-base.vue

@@ -39,7 +39,8 @@
     refviewtype='DEGRIDVIEW' 
     refreshitems='' 
     :ignorefieldvaluechange="ignorefieldvaluechange"
-    viewname='wfmember-grid-view' 
+    viewname='wfmember-grid-view'
+    tempMode='0'
     :data="JSON.stringify(this.data)" 
     @drdatasaved="drdatasaved($event)"
     style=";overflow: auto;">
@@ -1208,6 +1209,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
+            data.wfgroup = null;
             this.$emit('load', data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });
@@ -1311,8 +1313,8 @@ export default class MainBase extends Vue implements ControlInterface {
             }
             const arg: any = { ...opt };
             const data = this.getValues();
-            Object.assign(arg, data);
             Object.assign(arg, this.context);
+            Object.assign(arg, data);
             if (ifStateNext) {
                 this.drcounter = 1;
                 if(this.drcounter !== 0){

app_web/src/widgets/wfmember/main-form/main-form-base.vue

@@ -1327,6 +1327,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
+            data.wfmember = null;
             this.$emit('load', data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });
@@ -1430,8 +1431,8 @@ export default class MainBase extends Vue implements ControlInterface {
             }
             const arg: any = { ...opt };
             const data = this.getValues();
-            Object.assign(arg, data);
             Object.assign(arg, this.context);
+            Object.assign(arg, data);
             if (ifStateNext) {
                 this.drcounter = 0;
                 if(this.drcounter !== 0){

app_web/src/widgets/wfprocess-definition/main-form/main-form-base.vue

@@ -1337,6 +1337,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
+            data.wfprocessdefinition = null;
             this.$emit('load', data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });
@@ -1440,8 +1441,8 @@ export default class MainBase extends Vue implements ControlInterface {
             }
             const arg: any = { ...opt };
             const data = this.getValues();
-            Object.assign(arg, data);
             Object.assign(arg, this.context);
+            Object.assign(arg, data);
             if (ifStateNext) {
                 this.drcounter = 0;
                 if(this.drcounter !== 0){

app_web/src/widgets/wfremodel/main-form/main-form-base.vue

@@ -1150,6 +1150,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
+            data.wfremodel = null;
             this.$emit('load', data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });
@@ -1253,8 +1254,8 @@ export default class MainBase extends Vue implements ControlInterface {
             }
             const arg: any = { ...opt };
             const data = this.getValues();
-            Object.assign(arg, data);
             Object.assign(arg, this.context);
+            Object.assign(arg, data);
             if (ifStateNext) {
                 this.drcounter = 0;
                 if(this.drcounter !== 0){

app_web/src/widgets/wfuser/main-form/main-form-base.vue

@@ -1179,6 +1179,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
+            data.wfuser = null;
             this.$emit('load', data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });
@@ -1282,8 +1283,8 @@ export default class MainBase extends Vue implements ControlInterface {
             }
             const arg: any = { ...opt };
             const data = this.getValues();
-            Object.assign(arg, data);
             Object.assign(arg, this.context);
+            Object.assign(arg, data);
             if (ifStateNext) {
                 this.drcounter = 0;
                 if(this.drcounter !== 0){

ibzwf-app/ibzwf-app-web/src/main/docker/Dockerfile

 
 FROM openjdk:8-jre-alpine
 
-ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
+ENV TZ=Asia/Shanghai \
+    SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
     IBIZ_SLEEP=0 \
     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..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-app-web.jar

ibzwf-provider/ibzwf-provider-api/src/main/docker/Dockerfile

 
 FROM openjdk:8-jre-alpine
 
-ENV SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
+ENV TZ=Asia/Shanghai \
+    SPRING_OUTPUT_ANSI_ENABLED=ALWAYS \
     IBIZ_SLEEP=0 \
     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..." && \
     sleep ${IBIZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-provider-api.jar

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/mapping/WFGroupMapping.java

@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.WFGroupDTO;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = "spring", uses = {},
+@Mapper(componentModel = "spring", uses = {},implementationName="apiWFGroupMapping",
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface WFGroupMapping extends MappingBase<WFGroupDTO, WFGroup> {

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/mapping/WFMemberMapping.java

@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.WFMemberDTO;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = "spring", uses = {},
+@Mapper(componentModel = "spring", uses = {},implementationName="apiWFMemberMapping",
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface WFMemberMapping extends MappingBase<WFMemberDTO, WFMember> {

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/mapping/WFProcessDefinitionMapping.java

@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.WFProcessDefinitionDTO;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = "spring", uses = {},
+@Mapper(componentModel = "spring", uses = {},implementationName="apiWFProcessDefinitionMapping",
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface WFProcessDefinitionMapping extends MappingBase<WFProcessDefinitionDTO, WFProcessDefinition> {

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/mapping/WFREModelMapping.java

@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.WFREModelDTO;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = "spring", uses = {},
+@Mapper(componentModel = "spring", uses = {},implementationName="apiWFREModelMapping",
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface WFREModelMapping extends MappingBase<WFREModelDTO, WFREModel> {

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/mapping/WFSystemMapping.java

@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.WFSystemDTO;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = "spring", uses = {},
+@Mapper(componentModel = "spring", uses = {},implementationName="apiWFSystemMapping",
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface WFSystemMapping extends MappingBase<WFSystemDTO, WFSystem> {

ibzwf-provider/ibzwf-provider-api/src/main/java/cn/ibizlab/api/mapping/WFUserMapping.java

@@ -6,7 +6,7 @@ import cn.ibizlab.api.dto.WFUserDTO;
 import cn.ibizlab.util.domain.MappingBase;
 import org.mapstruct.factory.Mappers;
 
-@Mapper(componentModel = "spring", uses = {},
+@Mapper(componentModel = "spring", uses = {},implementationName="apiWFUserMapping",
     nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE,
     nullValueCheckStrategy = NullValueCheckStrategy.ALWAYS)
 public interface WFUserMapping extends MappingBase<WFUserDTO, WFUser> {