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/components/app-picker/app-picker.vue

@@ -176,6 +176,15 @@ export default class AppPicker extends Vue {
      */
     @Prop() public valueitem!: string;
 
+    /**
+     * 排序
+     *
+     * @type {string}
+     * @memberof AppPicker
+     */
+    @Prop() public sort?: string;
+
+
     /**
      * 值
      *
@@ -320,6 +329,9 @@ export default class AppPicker extends Vue {
             query = '';
         }
         this.inputState = false;
+        if(this.sort && !Object.is(this.sort, "")) {
+            Object.assign(_param, { sort: this.sort });
+        }
         Object.assign(_param, { query: query });
         // 错误信息国际化
         let error: string = (this.$t('components.appPicker.error') as any);

app_web/src/widgets/jobs-info/main-form/main-form-base.vue

@@ -1545,6 +1545,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
+            data.jobsinfo = null;
             this.$emit('load', data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });
@@ -1648,8 +1649,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/jobs-log/main-form/main-form-base.vue

@@ -1385,6 +1385,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
+            data.jobslog = null;
             this.$emit('load', data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });
@@ -1488,8 +1489,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/jobs-registry/main-form/main-form-base.vue

@@ -1220,6 +1220,7 @@ export default class MainBase extends Vue implements ControlInterface {
             const data = response.data;
             this.resetDraftFormStates();
             this.onFormLoad(data,'loadDraft');
+            data.jobsregistry = null;
             this.$emit('load', data);
             this.$nextTick(() => {
                 this.formState.next({ type: 'load', data: data });
@@ -1323,8 +1324,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){

ibztask-app/ibztask-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 /ibztask-app-web.jar

ibztask-provider/ibztask-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 /ibztask-provider-api.jar

ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/mapping/JobsInfoMapping.java

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

ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/mapping/JobsLockMapping.java

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

ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/mapping/JobsLogMapping.java

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

ibztask-provider/ibztask-provider-api/src/main/java/cn/ibizlab/api/mapping/JobsRegistryMapping.java

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