ibiz4j 发布系统代码 [ibiz-task，任务调度]

app_web/CHANGELOG.md

+## v7.0.0-alpha.21 [2020-10-31]
+
+### Bug修复
+
+修复视图类型门户部件通知嵌入视图刷新问题
+
+修复表格行编辑传值无效和设置表格行编辑禁用无效问题
+
+修复表格列触发行为权限控制无效问题
+
+修复表格导出代码表转化问题
+
+修复行编辑时合并行主键到上下文中
+
+修复多表单编辑视图(部件视图)临时模式异常问题
+
+修复修复表单值规则异常问题
+
+### 功能新增及优化
+
+#### 模板
+
+新增导航类部件快速搜索栏提示
+
+新增分页导航面板主状态逻辑
+
+新增图片预览（可旋转）控件
+
+新增多数据部件无值显示内容适配
+
+新增分页导航视图工具栏权限状态逻辑
+
+新增适配界面行为中显示处理
+
+新增支持是否支持实体主状态属性
+
+优化列表加载、刷新逻辑
+
+优化直接内容项组件
+
+优化甘特图部件和树表格部件加载逻辑
+
+优化后台界面行为异常处理逻辑
+
+优化分页导航面板切换分页刷新逻辑
+
+优化树导航视图树节点刷新逻辑
+
+优化表单更新项传入调用方法名称
+
+优化行编辑值校验错误信息提示
+
+#### 基础文件
+
+新增图片预览（可旋转）控件
+
+新增计算分页导航视图工具栏权限状态逻辑
+
+新增支持是否支持实体主状态逻辑
+
+新增切换组织部门功能
+
+优化数据选择下拉控件（下拉列表宽度和编辑器宽度保持一致）
+
+优化直接内容项组件
+
+修复数据选择无值抛出null
+
+修复登录完成user存储到localStorage
+
+修复表格值为0不显示问题
+
 ## v7.0.0-alpha.20 [2020-10-18]
 
 ### Bug修复

app_web/src/app-register.ts

@@ -97,6 +97,7 @@ import AppFormPart from './components/app-form-part/app-form-part.vue'
 import AppAlert from './components/app-alert/app-alert.vue'
 import AppAlertGroup from './components/app-alert-group/app-alert-group.vue'
 import AppRawItem from './components/app-rawitem/app-rawitem.vue'
+import AppImageRomate from './components/app-image-romate/app-image-romate.vue'
 
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
@@ -209,5 +210,6 @@ export const AppComponents = {
         v.component('app-alert', AppAlert);
         v.component('app-alert-group', AppAlertGroup);
         v.component('app-rawitem',AppRawItem);
+        v.component('app-image-romate', AppImageRomate)
     },
 };
\ No newline at end of file

app_web/src/components/app-actionbar/app-actionbar.vue

@@ -100,6 +100,8 @@ export default class AppActionBar extends Vue {
    * @memberof AppActionBar
    */
   public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
+    if(!UIService.isEnableDEMainState)
+      return;    
     for (const key in ActionModel) {
         if (!ActionModel.hasOwnProperty(key)) {
             return;

app_web/src/components/app-column-link/app-column-link.vue

@@ -279,7 +279,7 @@ export default class AppColumnLink extends Vue {
         if (result.datas && Array.isArray(result.datas)) {
             Object.assign(item, result.datas[0]);
         }
-        console.log(item);
+        this.$emit('refresh',item);
     }
 
     /**

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

@@ -158,6 +158,8 @@ export default class AppFormGroup extends Vue {
      * @memberof AppFormGroup
      */
     public calcActionItemAuthState(data:any,ActionModel:any,UIService:any){
+        if(!UIService.isEnableDEMainState)
+            return;
         for (const key in ActionModel) {
             if (!ActionModel.hasOwnProperty(key)) {
                 return;

app_web/src/components/app-format-data/app-format-data.vue

@@ -47,7 +47,7 @@ export default class AppFormatData extends Vue {
    * @memberof AppFormatData
    */
   getcurValue(){
-    if(this.data){
+    if(this.data || this.data == 0){
       if(Object.is(this.dataType,"DECIMAL") || Object.is(this.dataType,"FLOAT") || Object.is(this.dataType,"CURRENCY")){
         let number = Number(this.data);
         let precision = Number(this.precision);

app_web/src/components/app-image-romate/app-image-romate.vue

+<template>
+  <div class='app-image-preview'>
+      <el-image :src="data[name]" :previewSrcList="previewList" :disabled="disabled">
+      </el-image>
+  </div>
+</template>
+<script lang = 'ts'>
+import { Vue, Component, Prop, Watch, Provide } from 'vue-property-decorator';
+import { Subject, Unsubscribable } from 'rxjs';
+
+@Component({})
+export default class AppImageRomate extends Vue {
+
+    /**
+     * 表单状态
+     *
+     * @type {any}
+     * @memberof AppImageRomate
+     */
+    @Prop() public formState: any;
+
+    /**
+     * 图片数据
+     *
+     * @type {any}
+     * @memberof AppImageRomate
+     */
+    @Prop() public data!: any;
+
+    /**
+     * 字段名
+     *
+     * @type {any}
+     * @memberof AppImageRomate
+     */
+    @Prop() public name: any;
+
+    /**
+     * 禁用状态
+     *
+     * @type {boolean}
+     * @memberof AppImageRomate
+     */
+    @Prop() public disabled: boolean = false;
+
+    /**
+     * 预览图片数组
+     *
+     * @type {boolean}
+     * @memberof AppImageRomate
+     */
+    public previewList:Array<any> = [];
+
+    /**
+     * 表单状态事件
+     *
+     * @private
+     * @type {(Unsubscribable | undefined)}
+     * @memberof AppImageUpload
+     */
+    private formStateEvent: Unsubscribable | undefined;
+
+    /**
+     * Vue生命周期
+     *
+     * @type {boolean}
+     * @memberof AppImageRomate
+     */
+    public created() {
+        if (this.formState) {
+            this.formStateEvent = this.formState.subscribe(($event: any) => {
+                // 表单加载完成
+                if(this.data && this.name) {
+                    this.handleData();
+                }
+            });
+        }
+    }
+
+    /**
+     * 数据处理
+     *
+     * @type {boolean}
+     * @memberof AppImageRomate
+     */
+    public handleData() {
+        this.previewList.push(this.data[this.name]);
+    }  
+    
+    /**
+     * 组件销毁
+     *
+     * @memberof AppImageRomate
+     */
+    public destroyed(): void {
+        if (this.formStateEvent) {
+            this.formStateEvent.unsubscribe();
+        }
+    }
+}
+
+</script>
\ No newline at end of file

app_web/src/components/app-orgsector/app-orgsector.vue

@@ -22,6 +22,7 @@
   </div>
 </template>
 <script lang = 'ts'>
+import { Http } from '@/utils/http/http';
 import { Vue, Component, Inject } from "vue-property-decorator";
 
 @Component({})
@@ -110,17 +111,33 @@ export default class AppOrgSector extends Vue {
     let item: any = this.selectedOrgArray.find((_item: any) => {
       return _item.srforgsectorid === data;
     });
+    this.switchDepartment(data).then((response:any) =>{
+        if (response.status == 200) {
           if (item.srforgsectorid && item.srforgsectorname) {
             this.selectedOrgId = item.srforgsectorid;
             this.selectedOrgName = item.srforgsectorname;
-      this.reload();
-
           }
           this.updateStoreOrgData(item);
+          this.reload();
+        }else{
+          this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.data?response.data.message:(this.$t('components.appOrgSector.errorSwitch') as string) });
+        }
+    }).catch((error:any) =>{
+        this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('components.appOrgSector.errorSwitch') as string) });
+    })
+  }
+
+  /**
+   * 调用远端切换部门接口
+   *
+   * @memberof AppOrgSector
+   */
+  public async switchDepartment(data:any){
+    return await Http.getInstance().post(`/oumaps/switch`,data,false);
   }
 
   /**
-   * 更新仓库Org信息
+   * 更新仓库部门信息
    *
    * @memberof AppOrgSector
    */

app_web/src/components/app-picker/app-picker.vue

@@ -37,7 +37,7 @@
     </div>
     <div v-else-if="Object.is(editortype, 'dropdown')" class='app-picker'>
         <el-select ref="appPicker" remote :remote-method="(query) => this.onSearch(query, null, true)" :value="refvalue" size='small' filterable
-            @change="onSelect" :disabled="disabled" style='width:100%;' clearable
+            @change="onSelect" :disabled="disabled" style='width:100%;' clearable popper-class="app-picker-dropdown"
             @clear="onClear" @visible-change="onSelectOpen">
             <template v-if="items">
                 <template v-for="_item in items">
@@ -260,6 +260,14 @@ export default class AppPicker extends Vue {
      */
     public selectValue = this.value;
 
+    /**
+     * 下拉列表节点元素
+     *
+     * @type {*}
+     * @memberof AppPicker
+     */
+    public dropdownDom:any = {};
+
     /**
      * 获取关联数据项值
      *
@@ -314,6 +322,8 @@ export default class AppPicker extends Vue {
      * @memberof AppPicker
      */
     public mounted() {
+        const dropdownDom:any = this.$el.getElementsByClassName('app-picker-dropdown')[0];
+        this.dropdownDom = dropdownDom;
     }
 
     /**
@@ -331,10 +341,22 @@ export default class AppPicker extends Vue {
     public onSelectOpen(flag: boolean): void {
         this.open = flag;
         if (this.open) {
+            //设置下拉列表的最大宽度
+            this.setDropdownWidth();
             this.onSearch(this.curvalue, null, true);
         }
     }
 
+    /**
+     * 设置下拉列表最大宽度使下拉列表宽度和编辑器宽度一致
+     *
+     * @memberof AppPicker
+     */
+    public setDropdownWidth(){
+        const elInput:any = this.$el.getElementsByClassName('el-input__inner')[0];
+        this.dropdownDom.style.maxWidth = elInput.offsetWidth+'px';
+    }
+
     /**
      * 执行搜索数据
      * @param query 
@@ -434,10 +456,10 @@ export default class AppPicker extends Vue {
      */
     public onClear($event: any): void {
         if (this.valueitem) {
-            this.$emit('formitemvaluechange', { name: this.valueitem, value: '' });
+            this.$emit('formitemvaluechange', { name: this.valueitem, value: null });
         }
         if (this.name) {
-            this.$emit('formitemvaluechange', { name: this.name, value: '' });
+            this.$emit('formitemvaluechange', { name: this.name, value: null });
         }
         this.fillPickUpData();
         this.$forceUpdate();

app_web/src/components/app-rawitem/app-rawitem.vue

 <template>
-    <div>
-        <span v-if="caption">{{caption}}</span>
-        <div :class="contentStyle" :style="sizeStyle">
-            <template v-if="Object.is(contentType,'RAW')">
-                {{rawContent ? rawContent : ''}}
-            </template>
-            <template v-else-if="Object.is(contentType,'HTML')">
-                {{htmlContent ? htmlContent : ''}}
-            </template>
-            <template v-else-if="Object.is(contentType,'IMAGE')">
+    <div :style="sizeStyle">
+        <span>{{caption}}</span>
+        <div v-if="Object.is(contentType,'RAW')" :class="contentStyle">
+            <slot></slot>
+        </div>
+        <div v-else-if="Object.is(contentType,'HTML')" :class="contentStyle" v-html="htmlContent" />
+        <div v-else-if="Object.is(contentType,'IMAGE')" :class="contentStyle">
              <i :class="imageClass ? imageClass : ''"></i>
-            </template>
         </div>
     </div>
 </template>
@@ -22,20 +18,28 @@ import { Component, Vue, Prop, Model, Watch } from "vue-property-decorator";
 export default class AppRawItem extends Vue {
 
     /**
-    * 内容类型
+    * 应用上下文
     * 
     * @type {string}
     * @memberof AppRawItem
     */
-    @Prop() public contentType!: string;
+    @Prop() public context!: any;
 
     /**
-     * 直接内容
+    * 视图参数
     * 
-     * @type {strin}
+    * @type {string}
+    * @memberof AppRawItem
+    */
+    @Prop() public viewparams!: any;
+
+    /**
+    * 内容类型
+    * 
+    * @type {string}
     * @memberof AppRawItem
     */
-    @Prop() public rawContent?: string;
+    @Prop() public contentType!: string;
 
     /**
      * html内容
@@ -46,7 +50,7 @@ export default class AppRawItem extends Vue {
     @Prop() public htmlContent?: string;
 
     /**
-     * html内容
+     * 图片
      * 
      * @type {strin}
      * @memberof AppRawItem

app_web/src/components/login/login.vue

@@ -183,6 +183,9 @@ export default class Login extends Vue {
                     localStorage.setItem('token', data.token);
                     this.setCookie('ibzuaa-token',data.token,0);
                 }
+                if(data && data.user){
+                    localStorage.setItem('user', JSON.stringify(data.user));
+                }
                 // 设置cookie,保存账号密码7天
                 this.setCookie("loginname",loginname, 7);
                 // 跳转首页

app_web/src/engine/view/tab-exp-view-engine.ts

@@ -44,4 +44,14 @@ export default class TabExpViewEngine extends ViewEngine {
             this.setViewState2({ tag: _item.name, action: 'load', viewdata: this.view.context });
         });
     }
+
+    /**
+     * 计算按钮状态
+     *
+     * @memberof TabExpViewEngine
+     */
+    public computeToolbarState(state:boolean,data:any){
+        this.calcToolbarItemState(state);
+        this.calcToolbarItemAuthState(data);
+    }
 }
\ No newline at end of file

app_web/src/engine/view/view-engine.ts

@@ -187,6 +187,8 @@ export default class ViewEngine {
      */
     public calcToolbarItemAuthState(data:any){
         const _this: any = this;
+        if(!_this.view.appUIService.isEnableDEMainState)
+            return;
         for (const key in _this.view.toolBarModels) {
             if (!_this.view.toolBarModels.hasOwnProperty(key)) {
                 return;

app_web/src/locale/lang/en-US.ts

@@ -41,7 +41,6 @@ export default {
             show: "Show",
             records: "records",
             totle: "totle",
-            noData: "No data",
             valueVail: "Value cannot be empty",
             group:"Group",
             other:"Other",

app_web/src/locale/lang/zh-CN.ts

@@ -41,7 +41,6 @@ export default {
             show: "显示",
             records: "条",
             totle: "共",
-            noData: "无数据",
             valueVail: "值不能为空",
             group:"分组",
             other:"其他",

app_web/src/locale/lanres/components/components_en_US.ts

@@ -11,6 +11,10 @@ export default {
         indexPage: 'home page',
         continue: 'to continue browsing',
     },
+    appOrgSector:{
+      successSwitch:'The switch was successful',
+      errorSwitch:'The switchover failed',
+    },
     appAutocomplete: {
         error: 'Error',
         miss: 'Missing parameter ',

app_web/src/locale/lanres/components/components_zh_CN.ts

@@ -11,6 +11,10 @@ export default {
         indexPage: '首页',
         continue: '继续浏览',
     },
+    appOrgSector:{
+      successSwitch:'切换成功',
+      errorSwitch:'切换失败',
+    },
     appAutocomplete: {
         error: '错误',
         miss: '缺少参数',

app_web/src/locale/lanres/entities/jobs-info/jobs-info_en_US.ts

@@ -69,6 +69,7 @@ export default {
 			timeout: "任务执行超时时间（秒）",
 			update_time: "更新时间",
 		},
+		nodata:"",
 		uiactions: {
 		},
 	},

app_web/src/locale/lanres/entities/jobs-info/jobs-info_zh_CN.ts

@@ -68,6 +68,7 @@ export default {
 			timeout: "任务执行超时时间（秒）",
 			update_time: "更新时间",
 		},
+		nodata:"",
 		uiactions: {
 		},
 	},

app_web/src/locale/lanres/entities/jobs-log/jobs-log_en_US.ts

@@ -58,6 +58,7 @@ export default {
 			fail_retry_count: "失败重试次数",
 			create_time: "创建时间",
 		},
+		nodata:"",
 		uiactions: {
 		},
 	},

app_web/src/locale/lanres/entities/jobs-log/jobs-log_zh_CN.ts

@@ -57,6 +57,7 @@ export default {
 			fail_retry_count: "失败重试次数",
 			create_time: "创建时间",
 		},
+		nodata:"",
 		uiactions: {
 		},
 	},

app_web/src/locale/lanres/entities/jobs-registry/jobs-registry_en_US.ts

@@ -43,6 +43,7 @@ export default {
 			address: "执行地址",
 			status: "状态",
 		},
+		nodata:"",
 		uiactions: {
 		},
 	},

app_web/src/locale/lanres/entities/jobs-registry/jobs-registry_zh_CN.ts

@@ -42,6 +42,7 @@ export default {
 			address: "执行地址",
 			status: "状态",
 		},
+		nodata:"",
 		uiactions: {
 		},
 	},

app_web/src/pages/task/jobs-info-edit-view/jobs-info-edit-view-base.vue

@@ -206,11 +206,11 @@ export default class JobsInfoEditViewBase extends Vue {
     @Watch('viewdata')
     onViewData(newVal: any, oldVal: any) {
         const _this: any = this;
+        
         if (!Object.is(newVal, oldVal) && _this.engine) {
             this.$nextTick(()=>{
               _this.parseViewParam();
               _this.engine.load();
-              
             });
         } else if(!Object.is(newVal, oldVal) && _this.refresh && _this.refresh instanceof Function) {
             _this.refresh();
@@ -555,7 +555,7 @@ export default class JobsInfoEditViewBase extends Vue {
         });
         if(_this.portletState){
             _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
-                if(!Object.is(res.name,'calendar-view9')){
+                if(!Object.is(res.name,'JobsInfoEditView')){
                     return;
                 }
                 if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){

app_web/src/pages/task/jobs-info-grid-view/jobs-info-grid-view-base.vue

@@ -268,11 +268,11 @@ export default class JobsInfoGridViewBase extends Vue {
     @Watch('viewdata')
     onViewData(newVal: any, oldVal: any) {
         const _this: any = this;
+        
         if (!Object.is(newVal, oldVal) && _this.engine) {
             this.$nextTick(()=>{
               _this.parseViewParam();
               _this.engine.load();
-              
             });
         } else if(!Object.is(newVal, oldVal) && _this.refresh && _this.refresh instanceof Function) {
             _this.refresh();
@@ -635,7 +635,7 @@ export default class JobsInfoGridViewBase extends Vue {
         });
         if(_this.portletState){
             _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
-                if(!Object.is(res.name,'calendar-view9')){
+                if(!Object.is(res.name,'JobsInfoGridView')){
                     return;
                 }
                 if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){

app_web/src/pages/task/jobs-log-edit-view/jobs-log-edit-view-base.vue

@@ -190,11 +190,11 @@ export default class JobsLogEditViewBase extends Vue {
     @Watch('viewdata')
     onViewData(newVal: any, oldVal: any) {
         const _this: any = this;
+        
         if (!Object.is(newVal, oldVal) && _this.engine) {
             this.$nextTick(()=>{
               _this.parseViewParam();
               _this.engine.load();
-              
             });
         } else if(!Object.is(newVal, oldVal) && _this.refresh && _this.refresh instanceof Function) {
             _this.refresh();
@@ -525,7 +525,7 @@ export default class JobsLogEditViewBase extends Vue {
         });
         if(_this.portletState){
             _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
-                if(!Object.is(res.name,'calendar-view9')){
+                if(!Object.is(res.name,'JobsLogEditView')){
                     return;
                 }
                 if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){

app_web/src/pages/task/jobs-log-grid-view/jobs-log-grid-view-base.vue

@@ -217,11 +217,11 @@ export default class JobsLogGridViewBase extends Vue {
     @Watch('viewdata')
     onViewData(newVal: any, oldVal: any) {
         const _this: any = this;
+        
         if (!Object.is(newVal, oldVal) && _this.engine) {
             this.$nextTick(()=>{
               _this.parseViewParam();
               _this.engine.load();
-              
             });
         } else if(!Object.is(newVal, oldVal) && _this.refresh && _this.refresh instanceof Function) {
             _this.refresh();
@@ -560,7 +560,7 @@ export default class JobsLogGridViewBase extends Vue {
         });
         if(_this.portletState){
             _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
-                if(!Object.is(res.name,'calendar-view9')){
+                if(!Object.is(res.name,'JobsLogGridView')){
                     return;
                 }
                 if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){

app_web/src/pages/task/jobs-registry-edit-view/jobs-registry-edit-view-base.vue

@@ -206,11 +206,11 @@ export default class JobsRegistryEditViewBase extends Vue {
     @Watch('viewdata')
     onViewData(newVal: any, oldVal: any) {
         const _this: any = this;
+        
         if (!Object.is(newVal, oldVal) && _this.engine) {
             this.$nextTick(()=>{
               _this.parseViewParam();
               _this.engine.load();
-              
             });
         } else if(!Object.is(newVal, oldVal) && _this.refresh && _this.refresh instanceof Function) {
             _this.refresh();
@@ -555,7 +555,7 @@ export default class JobsRegistryEditViewBase extends Vue {
         });
         if(_this.portletState){
             _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
-                if(!Object.is(res.name,'calendar-view9')){
+                if(!Object.is(res.name,'JobsRegistryEditView')){
                     return;
                 }
                 if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){

app_web/src/pages/task/jobs-registry-grid-view/jobs-registry-grid-view-base.vue

@@ -247,11 +247,11 @@ export default class JobsRegistryGridViewBase extends Vue {
     @Watch('viewdata')
     onViewData(newVal: any, oldVal: any) {
         const _this: any = this;
+        
         if (!Object.is(newVal, oldVal) && _this.engine) {
             this.$nextTick(()=>{
               _this.parseViewParam();
               _this.engine.load();
-              
             });
         } else if(!Object.is(newVal, oldVal) && _this.refresh && _this.refresh instanceof Function) {
             _this.refresh();
@@ -608,7 +608,7 @@ export default class JobsRegistryGridViewBase extends Vue {
         });
         if(_this.portletState){
             _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
-                if(!Object.is(res.name,'calendar-view9')){
+                if(!Object.is(res.name,'JobsRegistryGridView')){
                     return;
                 }
                 if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){

app_web/src/pages/task/task-index-view/task-index-view-base.vue

@@ -187,11 +187,11 @@ export default class TaskIndexViewBase extends Vue {
     @Watch('viewdata')
     onViewData(newVal: any, oldVal: any) {
         const _this: any = this;
+        
         if (!Object.is(newVal, oldVal) && _this.engine) {
             this.$nextTick(()=>{
               _this.parseViewParam();
               _this.engine.load();
-              
             });
         } else if(!Object.is(newVal, oldVal) && _this.refresh && _this.refresh instanceof Function) {
             _this.refresh();
@@ -489,7 +489,7 @@ export default class TaskIndexViewBase extends Vue {
         });
         if(_this.portletState){
             _this.portletStateEvent = _this.portletState.subscribe((res:any) =>{
-                if(!Object.is(res.name,'calendar-view9')){
+                if(!Object.is(res.name,'TaskIndexView')){
                     return;
                 }
                 if(Object.is(res.action,'refresh') && _this.refresh && _this.refresh instanceof Function){

app_web/src/uiservice/jobs-info/jobs-info-ui-service-base.ts

@@ -20,6 +20,13 @@ export default class JobsInfoUIServiceBase extends UIService {
      */
     public isEnableWorkflow:boolean = false;
 
+    /**
+     * 是否支持实体主状态
+     * 
+     * @memberof  JobsInfoUIServiceBase
+     */
+    public isEnableDEMainState:boolean = false;
+
     /**
      * 当前UI服务对应的数据服务对象
      * 
@@ -156,15 +163,15 @@ export default class JobsInfoUIServiceBase extends UIService {
                     return;
                 }
                 actionContext.$Notice.success({ title: '成功', desc: '执行成功！' });
-
                 const _this: any = actionContext;
                 return response;
             }).catch((response: any) => {
-                if (!response || !response.status || !response.data) {
-                    actionContext.$Notice.error({ title: '错误', desc: '系统异常！' });
+                if (response && response.status && response.data) {
+                    actionContext.$Notice.error({ title: (actionContext.$t('app.commonWords.wrong') as string), desc: response.data.message });
                     return;
                 }
-                if (response.status === 401) {
+                if (!response || !response.status || !response.data) {
+                    actionContext.$Notice.error({ title: (actionContext.$t('app.commonWords.wrong') as string), desc: (actionContext.$t('app.commonWords.sysException') as string) });
                     return;
                 }
                 return response;
@@ -220,15 +227,15 @@ export default class JobsInfoUIServiceBase extends UIService {
                     return;
                 }
                 actionContext.$Notice.success({ title: '成功', desc: '启动成功！' });
-
                 const _this: any = actionContext;
                 return response;
             }).catch((response: any) => {
-                if (!response || !response.status || !response.data) {
-                    actionContext.$Notice.error({ title: '错误', desc: '系统异常！' });
+                if (response && response.status && response.data) {
+                    actionContext.$Notice.error({ title: (actionContext.$t('app.commonWords.wrong') as string), desc: response.data.message });
                     return;
                 }
-                if (response.status === 401) {
+                if (!response || !response.status || !response.data) {
+                    actionContext.$Notice.error({ title: (actionContext.$t('app.commonWords.wrong') as string), desc: (actionContext.$t('app.commonWords.sysException') as string) });
                     return;
                 }
                 return response;
@@ -284,15 +291,15 @@ export default class JobsInfoUIServiceBase extends UIService {
                     return;
                 }
                 actionContext.$Notice.success({ title: '成功', desc: '停止成功！' });
-
                 const _this: any = actionContext;
                 return response;
             }).catch((response: any) => {
-                if (!response || !response.status || !response.data) {
-                    actionContext.$Notice.error({ title: '错误', desc: '系统异常！' });
+                if (response && response.status && response.data) {
+                    actionContext.$Notice.error({ title: (actionContext.$t('app.commonWords.wrong') as string), desc: response.data.message });
                     return;
                 }
-                if (response.status === 401) {
+                if (!response || !response.status || !response.data) {
+                    actionContext.$Notice.error({ title: (actionContext.$t('app.commonWords.wrong') as string), desc: (actionContext.$t('app.commonWords.sysException') as string) });
                     return;
                 }
                 return response;

app_web/src/uiservice/jobs-lock/jobs-lock-ui-service-base.ts

@@ -20,6 +20,13 @@ export default class JobsLockUIServiceBase extends UIService {
      */
     public isEnableWorkflow:boolean = false;
 
+    /**
+     * 是否支持实体主状态
+     * 
+     * @memberof  JobsLockUIServiceBase
+     */
+    public isEnableDEMainState:boolean = false;
+
     /**
      * 当前UI服务对应的数据服务对象
      * 

app_web/src/uiservice/jobs-log/jobs-log-ui-service-base.ts

@@ -20,6 +20,13 @@ export default class JobsLogUIServiceBase extends UIService {
      */
     public isEnableWorkflow:boolean = false;
 
+    /**
+     * 是否支持实体主状态
+     * 
+     * @memberof  JobsLogUIServiceBase
+     */
+    public isEnableDEMainState:boolean = false;
+
     /**
      * 当前UI服务对应的数据服务对象
      * 

app_web/src/uiservice/jobs-registry/jobs-registry-ui-service-base.ts

@@ -20,6 +20,13 @@ export default class JobsRegistryUIServiceBase extends UIService {
      */
     public isEnableWorkflow:boolean = false;
 
+    /**
+     * 是否支持实体主状态
+     * 
+     * @memberof  JobsRegistryUIServiceBase
+     */
+    public isEnableDEMainState:boolean = false;
+
     /**
      * 当前UI服务对应的数据服务对象
      * 

app_web/src/utils/view-tool/view-tool.ts

@@ -258,7 +258,7 @@ export class ViewTool {
                 return result;
             }
             const _item = ActionModel[key];
-            if(_item && _item['dataaccaction'] && UIService){
+            if(_item && _item['dataaccaction'] && UIService && UIService.isEnableDEMainState){
                 let dataActionResult:any;
                 if(Object.is(_item['actiontarget'],"NONE") || Object.is(_item['actiontarget'],"")){
                     dataActionResult = UIService.getResourceOPPrivs(_item['dataaccaction']);

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

@@ -16,7 +16,7 @@
         @row-dblclick="rowDBLClick($event)"  
         ref='multipleTable' :data="items" :show-header="!isHideHeader">
             <template slot="empty">
-                {{$t('app.gridpage.noData')}} 
+                {{$t('entities.jobsinfo.main_grid.nodata')}} 
             </template>
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
@@ -640,6 +640,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public isDisplay:boolean = true;
 
+    /**
+     * 表格行编辑项校验错误提示信息
+     *
+     * @type {boolean}
+     * @memberof MainBase
+     */
+    public errorMessages: Array<any> = [];
+
     /**
      * 部件刷新
      *
@@ -680,6 +688,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'app',
@@ -688,6 +697,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'handler',
@@ -696,6 +706,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'cron',
@@ -704,6 +715,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'last_time',
@@ -712,6 +724,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'next_time',
@@ -720,6 +733,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'status',
@@ -728,6 +742,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'timeout',
@@ -736,6 +751,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'update_time',
@@ -744,6 +760,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
     ]
 
@@ -854,6 +871,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public async validateAll(){
+        this.errorMessages = [];
         let validateState = true;
         let index = -1;
         for(let item of this.items){
@@ -862,6 +880,7 @@ export default class MainBase extends Vue implements ControlInterface {
             for(let property of Object.keys(this.rules)){
               if(!await this.validate(property,item,index)){
                 validateState = false;
+                this.errorMessages.push(this.gridItemsModel[index][property].error);
               }
             }
           }
@@ -1229,7 +1248,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public getCodelistValue(items: any[], value: any, codelist: any,){
-        if(!value){
+        if(!value && value !== 0 && value !== false){
             return this.$t('codelist.'+codelist.srfkey+'.empty');
         }
         if (items) {
@@ -1810,8 +1829,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             }
         }
-        if(!await this.validateAll()){
+        if (!await this.validateAll()) {
+            if(this.errorMessages && this.errorMessages.length > 0) {
+                let descMessage: string = '';
+                this.errorMessages.forEach((message: any) => {
+                    descMessage = descMessage + '<p>' + message + '<p>';
+                })
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: descMessage });
+            } else {
                 this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.rulesException') as string) });
+            }
             return [];
         }
         let successItems:any = [];
@@ -1951,9 +1978,11 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!mode || (mode && Object.is(mode, ''))) {
             return;
         }
+        let tempContext: any = this.$util.deepCopy(this.context);
+        Object.is(tempContext, { jobsinfo: data.id });
         const arg: any = JSON.parse(JSON.stringify(data));
         Object.assign(arg,{viewparams:this.viewparams});
-        const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(this.context)),arg, showloading);
+        const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(tempContext)),arg, showloading);
         post.then((response: any) => {
             if (!response || response.status !== 200) {
                 this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.gridpage.formitemFailed') as string) });
@@ -2194,6 +2223,24 @@ export default class MainBase extends Vue implements ControlInterface {
         })
     }
 
+    /**
+     * 获取表格列禁用状态
+     *
+     * @memberof MainBase
+     */
+    public  getColumnDisabled(data:any,name:string){
+        if(this.allColumns || Array.isArray(this.allColumns)){
+            const curColumn:any = this.allColumns.find((item:any) =>{
+                return item.name === name;
+            })
+            if(curColumn.hasOwnProperty('enableCond')){
+                return data.srfuf == 1 ? (curColumn.enableCond & 2) !== 2 : (curColumn.enableCond & 1) !== 1
+            }else{
+                return false;
+            }
+        }
+    }
+
 }
 </script>
 

app_web/src/widgets/jobs-info/main-grid/main-grid-service.ts

@@ -216,7 +216,7 @@ export default class MainService extends ControlService {
             result.then((response) => {
                 //处理返回数据，补充判断标识
                 if(response.data){
-                    Object.assign(response.data,{srfuf:0});
+                    Object.assign(response.data,{srfuf:'0'});
                 }
                 resolve(response);
             }).catch(response => {
@@ -347,7 +347,7 @@ export default class MainService extends ControlService {
                     requestData[item.prop] = context[item.name];
                 }
             }else{
-                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0) || Object.is(data[item.name],"")) ){
+                if(item && item.isEditable && item.prop && item.name && data.hasOwnProperty(item.name)){
                     requestData[item.prop] = data[item.name];
                 }
             }

app_web/src/widgets/jobs-log/main-grid/main-grid-base.vue

@@ -16,7 +16,7 @@
         @row-dblclick="rowDBLClick($event)"  
         ref='multipleTable' :data="items" :show-header="!isHideHeader">
             <template slot="empty">
-                {{$t('app.gridpage.noData')}} 
+                {{$t('entities.jobslog.main_grid.nodata')}} 
             </template>
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
@@ -626,6 +626,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public isDisplay:boolean = true;
 
+    /**
+     * 表格行编辑项校验错误提示信息
+     *
+     * @type {boolean}
+     * @memberof MainBase
+     */
+    public errorMessages: Array<any> = [];
+
     /**
      * 部件刷新
      *
@@ -666,6 +674,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'job_id',
@@ -674,6 +683,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'handler',
@@ -682,6 +692,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'address',
@@ -690,6 +701,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'trigger_code',
@@ -698,6 +710,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'trigger_type',
@@ -706,6 +719,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'fail_retry_count',
@@ -714,6 +728,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'create_time',
@@ -722,6 +737,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
     ]
 
@@ -832,6 +848,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public async validateAll(){
+        this.errorMessages = [];
         let validateState = true;
         let index = -1;
         for(let item of this.items){
@@ -840,6 +857,7 @@ export default class MainBase extends Vue implements ControlInterface {
             for(let property of Object.keys(this.rules)){
               if(!await this.validate(property,item,index)){
                 validateState = false;
+                this.errorMessages.push(this.gridItemsModel[index][property].error);
               }
             }
           }
@@ -1199,7 +1217,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public getCodelistValue(items: any[], value: any, codelist: any,){
-        if(!value){
+        if(!value && value !== 0 && value !== false){
             return this.$t('codelist.'+codelist.srfkey+'.empty');
         }
         if (items) {
@@ -1779,8 +1797,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             }
         }
-        if(!await this.validateAll()){
+        if (!await this.validateAll()) {
+            if(this.errorMessages && this.errorMessages.length > 0) {
+                let descMessage: string = '';
+                this.errorMessages.forEach((message: any) => {
+                    descMessage = descMessage + '<p>' + message + '<p>';
+                })
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: descMessage });
+            } else {
                 this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.rulesException') as string) });
+            }
             return [];
         }
         let successItems:any = [];
@@ -1920,9 +1946,11 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!mode || (mode && Object.is(mode, ''))) {
             return;
         }
+        let tempContext: any = this.$util.deepCopy(this.context);
+        Object.is(tempContext, { jobslog: data.id });
         const arg: any = JSON.parse(JSON.stringify(data));
         Object.assign(arg,{viewparams:this.viewparams});
-        const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(this.context)),arg, showloading);
+        const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(tempContext)),arg, showloading);
         post.then((response: any) => {
             if (!response || response.status !== 200) {
                 this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.gridpage.formitemFailed') as string) });
@@ -2163,6 +2191,24 @@ export default class MainBase extends Vue implements ControlInterface {
         })
     }
 
+    /**
+     * 获取表格列禁用状态
+     *
+     * @memberof MainBase
+     */
+    public  getColumnDisabled(data:any,name:string){
+        if(this.allColumns || Array.isArray(this.allColumns)){
+            const curColumn:any = this.allColumns.find((item:any) =>{
+                return item.name === name;
+            })
+            if(curColumn.hasOwnProperty('enableCond')){
+                return data.srfuf == 1 ? (curColumn.enableCond & 2) !== 2 : (curColumn.enableCond & 1) !== 1
+            }else{
+                return false;
+            }
+        }
+    }
+
 }
 </script>
 

app_web/src/widgets/jobs-log/main-grid/main-grid-service.ts

@@ -216,7 +216,7 @@ export default class MainService extends ControlService {
             result.then((response) => {
                 //处理返回数据，补充判断标识
                 if(response.data){
-                    Object.assign(response.data,{srfuf:0});
+                    Object.assign(response.data,{srfuf:'0'});
                 }
                 resolve(response);
             }).catch(response => {
@@ -347,7 +347,7 @@ export default class MainService extends ControlService {
                     requestData[item.prop] = context[item.name];
                 }
             }else{
-                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0) || Object.is(data[item.name],"")) ){
+                if(item && item.isEditable && item.prop && item.name && data.hasOwnProperty(item.name)){
                     requestData[item.prop] = data[item.name];
                 }
             }

app_web/src/widgets/jobs-registry/main-grid/main-grid-base.vue

@@ -16,7 +16,7 @@
         @row-dblclick="rowDBLClick($event)"  
         ref='multipleTable' :data="items" :show-header="!isHideHeader">
             <template slot="empty">
-                {{$t('app.gridpage.noData')}} 
+                {{$t('entities.jobsregistry.main_grid.nodata')}} 
             </template>
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
@@ -580,6 +580,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */
     public isDisplay:boolean = true;
 
+    /**
+     * 表格行编辑项校验错误提示信息
+     *
+     * @type {boolean}
+     * @memberof MainBase
+     */
+    public errorMessages: Array<any> = [];
+
     /**
      * 部件刷新
      *
@@ -620,6 +628,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'app',
@@ -628,6 +637,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'address',
@@ -636,6 +646,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
         {
             name: 'status',
@@ -644,6 +655,7 @@ export default class MainBase extends Vue implements ControlInterface {
             show: true,
             unit: 'PX',
             isEnableRowEdit: false,
+            enableCond: 3 ,
         },
     ]
 
@@ -754,6 +766,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public async validateAll(){
+        this.errorMessages = [];
         let validateState = true;
         let index = -1;
         for(let item of this.items){
@@ -762,6 +775,7 @@ export default class MainBase extends Vue implements ControlInterface {
             for(let property of Object.keys(this.rules)){
               if(!await this.validate(property,item,index)){
                 validateState = false;
+                this.errorMessages.push(this.gridItemsModel[index][property].error);
               }
             }
           }
@@ -1129,7 +1143,7 @@ export default class MainBase extends Vue implements ControlInterface {
      * @memberof MainBase
      */
     public getCodelistValue(items: any[], value: any, codelist: any,){
-        if(!value){
+        if(!value && value !== 0 && value !== false){
             return this.$t('codelist.'+codelist.srfkey+'.empty');
         }
         if (items) {
@@ -1705,8 +1719,16 @@ export default class MainBase extends Vue implements ControlInterface {
                 }
             }
         }
-        if(!await this.validateAll()){
+        if (!await this.validateAll()) {
+            if(this.errorMessages && this.errorMessages.length > 0) {
+                let descMessage: string = '';
+                this.errorMessages.forEach((message: any) => {
+                    descMessage = descMessage + '<p>' + message + '<p>';
+                })
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: descMessage });
+            } else {
                 this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.rulesException') as string) });
+            }
             return [];
         }
         let successItems:any = [];
@@ -1846,9 +1868,11 @@ export default class MainBase extends Vue implements ControlInterface {
         if (!mode || (mode && Object.is(mode, ''))) {
             return;
         }
+        let tempContext: any = this.$util.deepCopy(this.context);
+        Object.is(tempContext, { jobsregistry: data.id });
         const arg: any = JSON.parse(JSON.stringify(data));
         Object.assign(arg,{viewparams:this.viewparams});
-        const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(this.context)),arg, showloading);
+        const post: Promise<any> = this.service.frontLogic(mode,JSON.parse(JSON.stringify(tempContext)),arg, showloading);
         post.then((response: any) => {
             if (!response || response.status !== 200) {
                 this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.gridpage.formitemFailed') as string) });
@@ -2089,6 +2113,24 @@ export default class MainBase extends Vue implements ControlInterface {
         })
     }
 
+    /**
+     * 获取表格列禁用状态
+     *
+     * @memberof MainBase
+     */
+    public  getColumnDisabled(data:any,name:string){
+        if(this.allColumns || Array.isArray(this.allColumns)){
+            const curColumn:any = this.allColumns.find((item:any) =>{
+                return item.name === name;
+            })
+            if(curColumn.hasOwnProperty('enableCond')){
+                return data.srfuf == 1 ? (curColumn.enableCond & 2) !== 2 : (curColumn.enableCond & 1) !== 1
+            }else{
+                return false;
+            }
+        }
+    }
+
 }
 </script>
 

app_web/src/widgets/jobs-registry/main-grid/main-grid-service.ts

@@ -216,7 +216,7 @@ export default class MainService extends ControlService {
             result.then((response) => {
                 //处理返回数据，补充判断标识
                 if(response.data){
-                    Object.assign(response.data,{srfuf:0});
+                    Object.assign(response.data,{srfuf:'0'});
                 }
                 resolve(response);
             }).catch(response => {
@@ -347,7 +347,7 @@ export default class MainService extends ControlService {
                     requestData[item.prop] = context[item.name];
                 }
             }else{
-                if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0) || Object.is(data[item.name],"")) ){
+                if(item && item.isEditable && item.prop && item.name && data.hasOwnProperty(item.name)){
                     requestData[item.prop] = data[item.name];
                 }
             }

ibztask-core/src/main/java/cn/ibizlab/core/task/service/IJobsInfoService.java

@@ -18,7 +18,6 @@ import org.springframework.cache.annotation.CacheEvict;
 import cn.ibizlab.core.task.domain.JobsInfo;
 import cn.ibizlab.core.task.filter.JobsInfoSearchContext;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

ibztask-core/src/main/java/cn/ibizlab/core/task/service/IJobsLockService.java

@@ -18,7 +18,6 @@ import org.springframework.cache.annotation.CacheEvict;
 import cn.ibizlab.core.task.domain.JobsLock;
 import cn.ibizlab.core.task.filter.JobsLockSearchContext;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

ibztask-core/src/main/java/cn/ibizlab/core/task/service/IJobsLogService.java

@@ -18,7 +18,6 @@ import org.springframework.cache.annotation.CacheEvict;
 import cn.ibizlab.core.task.domain.JobsLog;
 import cn.ibizlab.core.task.filter.JobsLogSearchContext;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

ibztask-core/src/main/java/cn/ibizlab/core/task/service/IJobsRegistryService.java

@@ -18,7 +18,6 @@ import org.springframework.cache.annotation.CacheEvict;
 import cn.ibizlab.core.task.domain.JobsRegistry;
 import cn.ibizlab.core.task.filter.JobsRegistrySearchContext;
 
-
 import com.baomidou.mybatisplus.extension.service.IService;
 
 /**

ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsInfoServiceImpl.java

@@ -215,6 +215,7 @@ public class JobsInfoServiceImpl extends ServiceImpl<JobsInfoMapper, JobsInfo> i
 
 
 
+
 }
 
 

ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsLockServiceImpl.java

@@ -191,6 +191,7 @@ public class JobsLockServiceImpl extends ServiceImpl<JobsLockMapper, JobsLock> i
 
 
 
+
 }
 
 

ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsLogServiceImpl.java

@@ -191,6 +191,7 @@ public class JobsLogServiceImpl extends ServiceImpl<JobsLogMapper, JobsLog> impl
 
 
 
+
 }
 
 

ibztask-core/src/main/java/cn/ibizlab/core/task/service/impl/JobsRegistryServiceImpl.java

@@ -191,6 +191,7 @@ public class JobsRegistryServiceImpl extends ServiceImpl<JobsRegistryMapper, Job
 
 
 
+
 }
 
 

ibztask-core/src/main/resources/sysmodel/ibztask.json

@@ -21,6 +21,7 @@
     "data_type":"VARCHAR",
     "data_length":100,
     "key_field":1,
+    "show_order":1,
     "major_field":0
     },
     {
@@ -34,6 +35,7 @@
     "data_type":"VARCHAR",
     "data_length":100,
     "key_field":0,
+    "show_order":2,
     "major_field":0
     },
     {
@@ -47,6 +49,7 @@
     "data_type":"VARCHAR",
     "data_length":100,
     "key_field":0,
+    "show_order":3,
     "major_field":0
     },
     {
@@ -60,6 +63,7 @@
     "data_type":"VARCHAR",
     "data_length":100,
     "key_field":0,
+    "show_order":4,
     "major_field":0
     },
     {
@@ -73,6 +77,7 @@
     "data_type":"VARCHAR",
     "data_length":255,
     "key_field":0,
+    "show_order":5,
     "major_field":1
     },
     {
@@ -86,6 +91,7 @@
     "data_type":"VARCHAR",
     "data_length":512,
     "key_field":0,
+    "show_order":6,
     "major_field":0
     },
     {
@@ -98,6 +104,7 @@
     "physical_field":1,
     "data_type":"INT",
     "key_field":0,
+    "show_order":7,
     "major_field":0
     },
     {
@@ -110,6 +117,7 @@
     "physical_field":1,
     "data_type":"INT",
     "key_field":0,
+    "show_order":8,
     "major_field":0
     },
     {
@@ -122,6 +130,7 @@
     "physical_field":1,
     "data_type":"BIGINT",
     "key_field":0,
+    "show_order":9,
     "major_field":0
     },
     {
@@ -134,6 +143,7 @@
     "physical_field":1,
     "data_type":"BIGINT",
     "key_field":0,
+    "show_order":10,
     "major_field":0
     },
     {
@@ -147,6 +157,7 @@
     "data_type":"VARCHAR",
     "data_length":30,
     "key_field":0,
+    "show_order":11,
     "major_field":0
     },
     {
@@ -160,6 +171,7 @@
     "data_type":"VARCHAR",
     "data_length":30,
     "key_field":0,
+    "show_order":12,
     "major_field":0
     },
     {
@@ -173,6 +185,7 @@
     "physical_field":1,
     "data_type":"INT",
     "key_field":0,
+    "show_order":13,
     "major_field":0
     },
     {
@@ -185,6 +198,7 @@
     "physical_field":1,
     "data_type":"DATETIME",
     "key_field":0,
+    "show_order":21,
     "major_field":0
     },
     {
@@ -198,6 +212,7 @@
     "data_type":"DATETIME",
     "predefined":"CREATEDATE",
     "key_field":0,
+    "show_order":22,
     "major_field":0
     }
     ],
@@ -226,6 +241,7 @@
     "data_type":"VARCHAR",
     "data_length":100,
     "key_field":1,
+    "show_order":1,
     "major_field":0
     },
     {
@@ -239,6 +255,7 @@
     "data_type":"VARCHAR",
     "data_length":30,
     "key_field":0,
+    "show_order":2,
     "major_field":1
     },
     {
@@ -252,6 +269,7 @@
     "data_type":"VARCHAR",
     "data_length":100,
     "key_field":0,
+    "show_order":3,
     "major_field":0
     },
     {
@@ -264,6 +282,7 @@
     "physical_field":1,
     "data_type":"DATETIME",
     "key_field":0,
+    "show_order":22,
     "major_field":0
     }
     ],
@@ -292,6 +311,7 @@
     "data_type":"VARCHAR",
     "data_length":100,
     "key_field":1,
+    "show_order":1,
     "major_field":0
     },
     {
@@ -305,6 +325,7 @@
     "data_type":"VARCHAR",
     "data_length":100,
     "key_field":0,
+    "show_order":2,
     "major_field":0
     },
     {
@@ -318,6 +339,7 @@
     "data_type":"VARCHAR",
     "data_length":255,
     "key_field":0,
+    "show_order":3,
     "major_field":0
     },
     {
@@ -331,6 +353,7 @@
     "data_type":"VARCHAR",
     "data_length":255,
     "key_field":0,
+    "show_order":5,
     "major_field":1
     },
     {
@@ -344,6 +367,7 @@
     "data_type":"VARCHAR",
     "data_length":512,
     "key_field":0,
+    "show_order":6,
     "major_field":0
     },
     {
@@ -356,6 +380,7 @@
     "physical_field":1,
     "data_type":"INT",
     "key_field":0,
+    "show_order":8,
     "major_field":0
     },
     {
@@ -368,6 +393,7 @@
     "physical_field":1,
     "data_type":"INT",
     "key_field":0,
+    "show_order":11,
     "major_field":0
     },
     {
@@ -381,6 +407,7 @@
     "data_type":"VARCHAR",
     "data_length":30,
     "key_field":0,
+    "show_order":12,
     "major_field":0
     },
     {
@@ -394,6 +421,7 @@
     "data_type":"TEXT",
     "data_length":1048576,
     "key_field":0,
+    "show_order":13,
     "major_field":0
     },
     {
@@ -406,6 +434,7 @@
     "physical_field":1,
     "data_type":"DATETIME",
     "key_field":0,
+    "show_order":22,
     "major_field":0
     }
     ],
@@ -434,6 +463,7 @@
     "data_type":"VARCHAR",
     "data_length":100,
     "key_field":1,
+    "show_order":1,
     "major_field":0
     },
     {
@@ -447,6 +477,7 @@
     "data_type":"VARCHAR",
     "data_length":100,
     "key_field":0,
+    "show_order":3,
     "major_field":1
     },
     {
@@ -460,6 +491,7 @@
     "data_type":"VARCHAR",
     "data_length":255,
     "key_field":0,
+    "show_order":4,
     "major_field":0
     },
     {
@@ -473,6 +505,7 @@
     "physical_field":1,
     "data_type":"INT",
     "key_field":0,
+    "show_order":13,
     "major_field":0
     },
     {
@@ -485,6 +518,7 @@
     "physical_field":1,
     "data_type":"DATETIME",
     "key_field":0,
+    "show_order":21,
     "major_field":0
     }
     ],

ibztask-dependencies/pom.xml

@@ -233,12 +233,6 @@
                 <version>${jsonwebtoken-jjwt.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.alibaba</groupId>
-                <artifactId>druid-spring-boot-starter</artifactId>
-                <version>${alibaba-druid.version}</version>
-            </dependency>
-
              <dependency>
                 <groupId>org.zalando</groupId>
                 <artifactId>problem-spring-web</artifactId>
@@ -351,6 +345,8 @@
         </dependency>
 
 
+
+
     </dependencies>
 
 </project>

ibztask-util/src/main/java/cn/ibizlab/util/annotation/DEField.java

@@ -2,6 +2,7 @@ package cn.ibizlab.util.annotation;
 
 import cn.ibizlab.util.enums.DEFieldDefaultValueType;
 import cn.ibizlab.util.enums.DEPredefinedFieldType;
+import cn.ibizlab.util.enums.DupCheck;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
@@ -66,5 +67,14 @@ public @interface DEField
 	 * @return
 	 */
     String format() default "";
+	/**
+	 * 重复性检查
+	 * @return
+	 */
+	DupCheck dupCheck() default DupCheck.NONE;
+	/**
+	 * 范围属性
+	 */
+	String dupCheckField() default "";
 }
 

ibztask-util/src/main/java/cn/ibizlab/util/domain/EntityClient.java

@@ -6,9 +6,9 @@ public class EntityClient extends EntityBase {
 
     @Override
     public void modify(String field,Object val) {
+        getExtensionparams().put("dirtyflagenable",true);
         if(val==null){
             this.getFocusNull().add(field.toLowerCase());
-            getExtensionparams().put("dirtyflagenable",true);
             getExtensionparams().put(field.toLowerCase()+"dirtyflag",true);
         }
         else{

ibztask-util/src/main/java/cn/ibizlab/util/enums/DupCheck.java

+package cn.ibizlab.util.enums;
+
+/**
+ * 属性重复值检查
+ */
+public enum DupCheck {
+    /**
+     * 不检查
+     */
+    NONE,
+    /**
+     * 全部检查
+     */
+    ALL,
+    /**
+     * 非空检查
+     */
+    NOTNULL,
+    /**
+     * 指定范围检查
+     */
+    RANGE,
+}

ibztask-util/src/main/java/cn/ibizlab/util/errors/ExceptionTranslator.java

 package cn.ibizlab.util.errors;
 
 
-import org.springframework.dao.ConcurrencyFailureException;
+import org.springframework.dao.*;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.BindingResult;
@@ -90,9 +90,18 @@ public class ExceptionTranslator implements ProblemHandling {
         return create(ex, problem, request);
     }
 
+    @ExceptionHandler(DataAccessException.class)
+    public ResponseEntity<Problem> handlerDataAccessFailure(DataAccessException ex, NativeWebRequest request){
+        Problem problem = Problem.builder()
+        .withStatus(Status.INTERNAL_SERVER_ERROR)
+        .with("message", ex.getMessage())
+        .build();
+        return create(ex, problem, request,createFailureAlert(ex.getClass().getSimpleName(), ex.getClass().getSimpleName(), ex.getMessage()));
+    }
+
     public static HttpHeaders createFailureAlert(String entityName, String errorKey, String defaultMessage) {
         HttpHeaders headers = new HttpHeaders();
-        headers.add("X-ibz-error", "error." + errorKey);
+        headers.add("X-ibz-error", errorKey);
         headers.add("X-ibz-params", entityName);
         return headers;
     }

ibztask-util/src/main/java/cn/ibizlab/util/job/PermissionSyncJob.java

@@ -41,6 +41,7 @@ public class PermissionSyncJob implements ApplicationRunner {
     @Lazy
     IBZLiteFeignClient liteFeignClient;
 
+
     @Override
     public void run(ApplicationArguments args) {
         try {
@@ -76,5 +77,6 @@ public class PermissionSyncJob implements ApplicationRunner {
         }
 
 
+
     }
 }
\ No newline at end of file

ibztask-util/src/main/java/cn/ibizlab/util/rest/AppController.java

@@ -59,6 +59,7 @@ public class AppController {
 			appData.put("enablepermissionvalid",false);
 		else
 			appData.put("enablepermissionvalid",enablePermissionValid);
+		fillAppData(appData);
 		return ResponseEntity.status(HttpStatus.OK).body(appData);
 	}
 
@@ -87,4 +88,12 @@ public class AppController {
 			throw new BadRequestAlertException("获取配置失败，参数缺失","IBZConfig",configType);
 		return ResponseEntity.ok(ibzConfigService.getConfig(configType,targetType,userId));
 	}
+
+	/**
+	* 应用参数扩展
+	* @param appData
+	*/
+	protected void fillAppData(JSONObject appData){
+
+	}
 }