zhouweidong 部署微服务应用 [ibz-wf，统一工作流]

app_web/src/app-register.ts

@@ -98,6 +98,7 @@ 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'
+import { MenuIcon } from './components/menu-icon/menu-icon'
 
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
@@ -210,6 +211,7 @@ 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)
+        v.component('app-image-romate', AppImageRomate);
+        v.component('menu-icon', MenuIcon);
     },
 };
\ No newline at end of file

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

@@ -341,6 +341,7 @@ export default class AppPicker extends Vue {
     public onSelectOpen(flag: boolean): void {
         this.open = flag;
         if (this.open) {
+            this.items = [];
             //设置下拉列表的最大宽度
             this.setDropdownWidth();
             this.onSearch(this.curvalue, null, true);

app_web/src/components/menu-icon/menu-icon.tsx

+import { Vue, Component, Prop } from 'vue-property-decorator';
+import './menu-icon.less';
+
+/**
+ * 平台菜单按钮适配
+ *
+ * @export
+ * @class MenuIcon
+ * @extends {Vue}
+ */
+@Component({})
+export class MenuIcon extends Vue {
+
+    /**
+     * 项数据
+     *
+     * @type {*}
+     * @memberof MenuIcon
+     */
+    @Prop()
+    public item: any;
+
+    /**
+     * 绘制图标
+     *
+     * @returns {*}
+     * @memberof MenuIcon
+     */
+    public render(): any {
+        if (this.item) {
+            if (this.item.iconcls) {
+                return <i class={this.item.iconcls} />
+            }
+            if (this.item.icon) {
+                return <img src={this.item.icon} />
+            }
+        }
+        return <span />
+    }
+
+}
\ No newline at end of file

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

@@ -97,6 +97,15 @@ export class SearchViewEngine extends ViewEngine {
         if (this.view && !this.view.isExpandSearchForm) {
             Object.assign(arg, { query: this.view.query });
         }
+        // 快速分组和快速搜索栏
+        let otherQueryParam:any = {};
+        if(this.view && this.view.quickGroupData){
+            Object.assign(otherQueryParam,this.view.quickGroupData);
+        }
+        if(this.view && this.view.quickFormData){
+            Object.assign(otherQueryParam,this.view.quickFormData);
+        }
+        Object.assign(arg,{viewparams:otherQueryParam});
     }
 
 

app_web/src/pages/workflow/wfgroup-edit-view/wfgroup-edit-view-base.vue

@@ -254,11 +254,11 @@ export default class WFGroupEditViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             
         } 

app_web/src/pages/workflow/wfgroup-grid-view/wfgroup-grid-view-base.vue

@@ -283,11 +283,11 @@ export default class WFGroupGridViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             
         } 

app_web/src/pages/workflow/wfgroup-mpickup-view/wfgroup-mpickup-view-base.vue

@@ -7,7 +7,60 @@
         <div class="content-container pickup-view">
         <div class='view-body-messages'>
         </div>
-           
+            <div class="translate-contant">
+                <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
+    <view_pickupviewpanel 
+        :viewState="viewState"  
+        :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+        :context="JSON.parse(JSON.stringify(context))" 
+        :isSingleSelect="isSingleSelect"
+        :selectedData="selectedData"
+        :isShowButton="isShowButton"
+        name="pickupviewpanel"  
+        ref='pickupviewpanel' 
+        @selectionchange="pickupviewpanel_selectionchange($event)"  
+        @activated="pickupviewpanel_activated($event)"  
+        @load="pickupviewpanel_load($event)"  
+        @closeview="closeView($event)">
+    </view_pickupviewpanel>
+                </div>
+                <div v-if="isShowButton" class="translate-buttons">
+                    <div class="buttons">
+                        <i-button type="primary" :title="this.containerModel.view_rightbtn.text"
+                            :disabled="this.containerModel.view_rightbtn.disabled"
+                            @click="onCLickRight">
+                            <i class="el-icon-arrow-right"></i>
+                        </i-button>
+                        <i-button type="primary" :title="this.containerModel.view_leftbtn.text"
+                            :disabled="this.containerModel.view_leftbtn.disabled"
+                            @click="onCLickLeft">
+                            <i class="el-icon-arrow-left"></i>
+                        </i-button>
+                        <i-button type="primary" :title="this.containerModel.view_allrightbtn.text"
+                            @click="onCLickAllRight">
+                            <i class="el-icon-d-arrow-right"></i>
+                        </i-button>
+                        <i-button type="primary" :title="this.containerModel.view_allleftbtn.text"
+                            @click="onCLickAllLeft">
+                            <i class="el-icon-d-arrow-left"></i>
+                        </i-button>
+                    </div>
+                    </div>
+                    <div v-if="isShowButton" class="right">
+                        <div class="mpicker-select">
+                            <div v-for="(item, index) in viewSelections" :key="index" :class="item._select ? 'select' : ''" @click="selectionsClick(item)" @dblclick="selectionsDBLClick(item)">
+                                <span>{{item.srfmajortext}}</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
+                    <row :style="{ textAlign: 'right' }">
+                        <i-button type="primary"  :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button>
+                            &nbsp;&nbsp;
+                        <i-button @click="onClickCancel">{{this.containerModel.view_cancelbtn.text}}</i-button>
+                    </row>
+                </card>   
         </div>
         <div class='view-bottom-messages'>
         </div>
@@ -145,11 +198,11 @@ export default class WFGroupMPickupViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             if(this.viewparams.selectedData){
                 this.selectedData = JSON.stringify(this.viewparams.selectedData);

app_web/src/pages/workflow/wfgroup-pickup-grid-view/wfgroup-pickup-grid-view-base.vue

@@ -178,11 +178,11 @@ export default class WFGroupPickupGridViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             
         } 

app_web/src/pages/workflow/wfgroup-pickup-view/wfgroup-pickup-view-base.vue

@@ -165,11 +165,11 @@ export default class WFGroupPickupViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             if(this.viewparams.selectedData){
                 this.selectedData = JSON.stringify(this.viewparams.selectedData);

app_web/src/pages/workflow/wfindex-view/wfindex-view-base.vue

@@ -167,11 +167,11 @@ export default class WFIndexViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             
         } 

app_web/src/pages/workflow/wfmember-edit-view/wfmember-edit-view-base.vue

@@ -254,11 +254,11 @@ export default class WFMemberEditViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             
         } 

app_web/src/pages/workflow/wfmember-grid-view/wfmember-grid-view-base.vue

@@ -283,11 +283,11 @@ export default class WFMemberGridViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             
         } 

app_web/src/pages/workflow/wfprocess-definition-edit-view/wfprocess-definition-edit-view-base.vue

@@ -254,11 +254,11 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             
         } 

app_web/src/pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view-base.vue

@@ -283,11 +283,11 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             
         } 

app_web/src/pages/workflow/wfremodel-edit-view/wfremodel-edit-view-base.vue

@@ -179,11 +179,11 @@ export default class WFREModelEditViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             
         } 

app_web/src/pages/workflow/wftask-edit-view/wftask-edit-view-base.vue

@@ -254,11 +254,11 @@ export default class WFTaskEditViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             
         } 

app_web/src/pages/workflow/wftask-grid-view/wftask-grid-view-base.vue

@@ -260,11 +260,11 @@ export default class WFTaskGridViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             
         } 

app_web/src/pages/workflow/wfuser-edit-view/wfuser-edit-view-base.vue

@@ -254,11 +254,11 @@ export default class WFUserEditViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             
         } 

app_web/src/pages/workflow/wfuser-grid-view/wfuser-grid-view-base.vue

@@ -283,11 +283,11 @@ export default class WFUserGridViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             
         } 

app_web/src/pages/workflow/wfuser-mpickup-view/wfuser-mpickup-view-base.vue

@@ -7,7 +7,60 @@
         <div class="content-container pickup-view">
         <div class='view-body-messages'>
         </div>
-           
+            <div class="translate-contant">
+                <div class="center" :style="{width : !isShowButton ? '100%' : ''}">
+    <view_pickupviewpanel 
+        :viewState="viewState"  
+        :viewparams="JSON.parse(JSON.stringify(viewparams))" 
+        :context="JSON.parse(JSON.stringify(context))" 
+        :isSingleSelect="isSingleSelect"
+        :selectedData="selectedData"
+        :isShowButton="isShowButton"
+        name="pickupviewpanel"  
+        ref='pickupviewpanel' 
+        @selectionchange="pickupviewpanel_selectionchange($event)"  
+        @activated="pickupviewpanel_activated($event)"  
+        @load="pickupviewpanel_load($event)"  
+        @closeview="closeView($event)">
+    </view_pickupviewpanel>
+                </div>
+                <div v-if="isShowButton" class="translate-buttons">
+                    <div class="buttons">
+                        <i-button type="primary" :title="this.containerModel.view_rightbtn.text"
+                            :disabled="this.containerModel.view_rightbtn.disabled"
+                            @click="onCLickRight">
+                            <i class="el-icon-arrow-right"></i>
+                        </i-button>
+                        <i-button type="primary" :title="this.containerModel.view_leftbtn.text"
+                            :disabled="this.containerModel.view_leftbtn.disabled"
+                            @click="onCLickLeft">
+                            <i class="el-icon-arrow-left"></i>
+                        </i-button>
+                        <i-button type="primary" :title="this.containerModel.view_allrightbtn.text"
+                            @click="onCLickAllRight">
+                            <i class="el-icon-d-arrow-right"></i>
+                        </i-button>
+                        <i-button type="primary" :title="this.containerModel.view_allleftbtn.text"
+                            @click="onCLickAllLeft">
+                            <i class="el-icon-d-arrow-left"></i>
+                        </i-button>
+                    </div>
+                    </div>
+                    <div v-if="isShowButton" class="right">
+                        <div class="mpicker-select">
+                            <div v-for="(item, index) in viewSelections" :key="index" :class="item._select ? 'select' : ''" @click="selectionsClick(item)" @dblclick="selectionsDBLClick(item)">
+                                <span>{{item.srfmajortext}}</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <card v-if="isShowButton" :dis-hover="true" :bordered="false" class="footer">
+                    <row :style="{ textAlign: 'right' }">
+                        <i-button type="primary"  :disabled="this.viewSelections.length > 0 ? false : true" @click="onClickOk">{{this.containerModel.view_okbtn.text}}</i-button>
+                            &nbsp;&nbsp;
+                        <i-button @click="onClickCancel">{{this.containerModel.view_cancelbtn.text}}</i-button>
+                    </row>
+                </card>   
         </div>
         <div class='view-bottom-messages'>
         </div>
@@ -145,11 +198,11 @@ export default class WFUserMPickupViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             if(this.viewparams.selectedData){
                 this.selectedData = JSON.stringify(this.viewparams.selectedData);

app_web/src/pages/workflow/wfuser-pickup-grid-view/wfuser-pickup-grid-view-base.vue

@@ -178,11 +178,11 @@ export default class WFUserPickupGridViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             
         } 

app_web/src/pages/workflow/wfuser-pickup-view/wfuser-pickup-view-base.vue

@@ -165,11 +165,11 @@ export default class WFUserPickupViewBase extends Vue {
     @Watch('viewparam',{immediate: true, deep: true})
     onParamData(newVal: any, oldVal: any) {
         if(newVal){
-            for(let key in this.viewparams){
-                delete this.viewparams[key];
-            }
-            if(typeof this.viewparams == 'string') {
+            this.viewparams = {};
+            if(typeof newVal == 'string') {
                 Object.assign(this.viewparams, JSON.parse(this.viewparam));
+            }else{
+                this.viewparams = Util.deepCopy(this.viewparam);
             }
             if(this.viewparams.selectedData){
                 this.selectedData = JSON.stringify(this.viewparams.selectedData);

app_web/src/styles/default.less

@@ -246,7 +246,7 @@
     }
 }
 
-.view-container.degridview, .view-container.degridview9, .view-container.dewfgridview, .view-container.delistview, .view-container.delistview9, .view-container.dedataview, .view-container.dedataview9{
+.view-container.degridview, .view-container.degridview9, .view-container.dewfgridview, .view-container.delistview, .view-container.delistview9, .view-container.dedataview, .view-container.dedataview9,.view-container.dechartview,.view-container.dechartview9{
   >.view-card.view-no-caption{
     >.ivu-card-body{
       height: 100%;

app_web/src/utils/interceptor/interceptor.ts

@@ -109,7 +109,13 @@ export class Interceptors {
             error = error ? error : { response: {} };
             let { response: res } = error;
             let { data: _data } = res;
-
+            // 处理异常
+            if(res.headers && res.headers['x-ibz-error']){
+                res.data.errorKey = res.headers['x-ibz-error'];
+            }
+            if(res.headers && res.headers['x-ibz-params']){
+                res.data.entityName = res.headers['x-ibz-params'];
+            }
             if (res.status === 401) {
                 this.doNoLogin(_data.data);
             }

app_web/src/widgets/app/wfindex-view-appmenu/wfindex-view-appmenu-base.vue

@@ -760,9 +760,17 @@ export default class WFIndexViewBase extends Vue implements ControlInterface {
                     item.items.map((singleItem:any) =>{
                         if(!singleItem.hidden){
                             item.hidden = false;
+                        }else{
+                            if(singleItem.items && singleItem.items.length >0){
+                                singleItem.items.map((grandsonItem:any) =>{
+                                    if(!grandsonItem.hidden){
+                                        item.hidden = false;
+                                    }
+                                })
+                            }
                         }
-                        if(singleItem.items && singleItem.items.length >0){
-                            this.computeParentMenus(singleItem.items);
+                        if(item.items && item.items.length >0){
+                            this.computeParentMenus(item.items);
                         }
                     })
                 }

app_web/src/widgets/control-service.ts

@@ -310,4 +310,23 @@ export default class ControlService {
             }
         })
     }
+
+    /**
+     * 根据后台标识获取数据标识名称
+     * 
+     * @param prop 后台标识
+     * @memberof ControlService
+     */
+    public getNameByProp(prop: any) {
+        let model: any = this.getMode();
+        if(!model || !prop) {
+            return false;
+        }
+        let dataItems: any[] = model.getDataItems();
+        prop = prop.replace(/([A-Z])/g,"_$1").toLowerCase();
+        let data: any = dataItems.find((item:any) => {
+            return Object.is(prop, item.prop);
+        });
+        return data.name;
+    }
 }
\ No newline at end of file

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

@@ -241,7 +241,6 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
-
     /**
      * 代码表服务对象
      *
@@ -250,6 +249,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */  
     public codeListService:CodeListService = new CodeListService({ $store: this.$store });
 
+    /**
+     * 主信息表格列
+     *
+     * @type {string}
+     * @memberof MainBase
+     */  
+    public majorInfoColName:string = "groupname";
+
     /**
      * 界面UI服务对象
      *
@@ -746,16 +753,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.errorMessages = [];
         let validateState = true;
         let index = -1;
-        for(let item of this.items){
-          index++;
-          if(item.rowDataState === "create" || item.rowDataState === "update"){
-            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);
-              }
+        for (let item of this.items) {
+            let tempMessage: string = '';
+            index++;
+            if (item.rowDataState === "create" || item.rowDataState === "update") {
+                for (let property of Object.keys(this.rules)) {
+                    if (!await this.validate(property, item, index)) {
+                        validateState = false;
+                        tempMessage = tempMessage + '<p>' + this.gridItemsModel[index][property].error + '<p>';
+                    }
+                }
             }
-          }
+            this.errorMessages.push(tempMessage);
         }
         return validateState;
     }
@@ -880,7 +889,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         let dataInfo = '';
         _datas.forEach((record: any, index: number) => {
-            let srfmajortext = record.name;
+            let srfmajortext = record.groupname;
             if (index < 5) {
                 if (!Object.is(dataInfo, '')) {
                     dataInfo += '、';
@@ -892,9 +901,9 @@ export default class MainBase extends Vue implements ControlInterface {
         });
 
         if (_datas.length < 5) {
-            dataInfo = dataInfo + ' '+(this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string)+(this.$t('app.gridpage.data') as string);
+            dataInfo = dataInfo + ' ' + (this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string) + (this.$t('app.gridpage.data') as string);
         } else {
-            dataInfo = dataInfo + '...' + ' '+(this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.desc2') as string);
+            dataInfo = ' ... ' + (this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string) + (this.$t('app.gridpage.data') as string);
         }
 
         const removeData = () => {
@@ -1198,7 +1207,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
                 if (Object.is('load', action)) {
-                    this.load(data);
+                    this.load(data,true);
                 }
                 if (Object.is('remove', action)) {
                     this.remove(data);
@@ -1689,11 +1698,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         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 });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: this.errorMessages[0] });
             } else {
                 this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.rulesException') as string) });
             }
@@ -1734,10 +1739,46 @@ export default class MainBase extends Vue implements ControlInterface {
         if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
-          errorItems.forEach((item:any,index:number)=>{
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: errorMessage[index].data.message });
-            console.error(errorMessage[index]);
-          });
+            errorItems.forEach((item: any, index: number) => {
+                if(errorMessage[index] && errorMessage[index].data) {
+                    if(Object.is(errorMessage[index].data.errorKey, 'DupCheck')) {
+                        let errorProp: string = errorMessage[index].data.message.match(/\[[a-zA-Z]*\]/)[0];
+                        let name: string = errorProp ? this.service.getNameByProp(errorProp.substr(1, errorProp.length-2)) : '';
+                        if(name) {
+                            let desc: any = this.allColumns.find((column: any) =>{
+                                return Object.is(column.name, name);
+                            });
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
+                            });
+                        } else {
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
+                            });
+                        }
+                    } else if(Object.is(errorMessage[index].data.errorKey, 'DuplicateKeyException')){
+                        let name: string = this.service.getNameByProp("groupid");
+                        if(name){
+                            let desc: any = this.allColumns.find((column: any) =>{
+                                return Object.is(column.name, name);
+                            });
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
+                            });
+                        }
+                    }else {
+                        this.$Notice.error({
+                            title: (this.$t('app.commonWords.saveFailed') as string),
+                            desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
+                        });
+                    }
+                } else {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.saveFailed') as string), desc: (item[this.majorInfoColName]?item[this.majorInfoColName]:"") + (this.$t('app.commonWords.saveFailed') as string) + '!' });
+                }
+            });
         }
         return successItems;
     }
@@ -1996,15 +2037,19 @@ export default class MainBase extends Vue implements ControlInterface {
         let startOp = (val:boolean)=>{
             if(falg.isPast){
                 if(opValue){
-                    falg.isPast = falg && val;
+                    falg.isPast = falg.isPast && val;
                 }else{
-                    falg.isPast = falg || val;
+                    falg.isPast = falg.isPast || val;
                 }
             }else{
                 falg.isPast = val;
             }
         }
         rule[name].forEach((item:any) => {
+            if((value === null || value === undefined || value === "") && (item.type != 'GROUP')){
+                startOp(true);
+                return falg;
+            }
             // 常规规则
             if(item.type == 'SIMPLE'){
                 startOp(!this.$verify.checkFieldSimpleRule(value,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.curEditRowData,item.isKeyCond));
@@ -2027,7 +2072,7 @@ export default class MainBase extends Vue implements ControlInterface {
             }
             // 分组
             if(item.type == 'GROUP'){
-                falg = this.verifyDeRules('group',item,"AND",value)
+                falg = this.verifyDeRules('group',item,item.condOP?item.condOP:"AND",value)
                 if(item.isNotMode){
                    falg.isPast = !falg.isPast;
                 }

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

@@ -253,7 +253,6 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
-
     /**
      * 代码表服务对象
      *
@@ -262,6 +261,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */  
     public codeListService:CodeListService = new CodeListService({ $store: this.$store });
 
+    /**
+     * 主信息表格列
+     *
+     * @type {string}
+     * @memberof MainBase
+     */  
+    public majorInfoColName:string = "";
+
     /**
      * 界面UI服务对象
      *
@@ -767,16 +774,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.errorMessages = [];
         let validateState = true;
         let index = -1;
-        for(let item of this.items){
-          index++;
-          if(item.rowDataState === "create" || item.rowDataState === "update"){
-            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);
-              }
+        for (let item of this.items) {
+            let tempMessage: string = '';
+            index++;
+            if (item.rowDataState === "create" || item.rowDataState === "update") {
+                for (let property of Object.keys(this.rules)) {
+                    if (!await this.validate(property, item, index)) {
+                        validateState = false;
+                        tempMessage = tempMessage + '<p>' + this.gridItemsModel[index][property].error + '<p>';
+                    }
+                }
             }
-          }
+            this.errorMessages.push(tempMessage);
         }
         return validateState;
     }
@@ -913,9 +922,9 @@ export default class MainBase extends Vue implements ControlInterface {
         });
 
         if (_datas.length < 5) {
-            dataInfo = dataInfo + ' '+(this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string)+(this.$t('app.gridpage.data') as string);
+            dataInfo = dataInfo + ' ' + (this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string) + (this.$t('app.gridpage.data') as string);
         } else {
-            dataInfo = dataInfo + '...' + ' '+(this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.desc2') as string);
+            dataInfo = ' ... ' + (this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string) + (this.$t('app.gridpage.data') as string);
         }
 
         const removeData = () => {
@@ -1219,7 +1228,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
                 if (Object.is('load', action)) {
-                    this.load(data);
+                    this.load(data,true);
                 }
                 if (Object.is('remove', action)) {
                     this.remove(data);
@@ -1711,11 +1720,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         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 });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: this.errorMessages[0] });
             } else {
                 this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.rulesException') as string) });
             }
@@ -1756,10 +1761,40 @@ export default class MainBase extends Vue implements ControlInterface {
         if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
-          errorItems.forEach((item:any,index:number)=>{
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: errorMessage[index].data.message });
-            console.error(errorMessage[index]);
-          });
+            errorItems.forEach((item: any, index: number) => {
+                if(errorMessage[index] && errorMessage[index].data) {
+                    if(Object.is(errorMessage[index].data.errorKey, 'DupCheck')) {
+                        let errorProp: string = errorMessage[index].data.message.match(/\[[a-zA-Z]*\]/)[0];
+                        let name: string = errorProp ? this.service.getNameByProp(errorProp.substr(1, errorProp.length-2)) : '';
+                        if(name) {
+                            let desc: any = this.allColumns.find((column: any) =>{
+                                return Object.is(column.name, name);
+                            });
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
+                            });
+                        } else {
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
+                            });
+                        }
+                    } else if(Object.is(errorMessage[index].data.errorKey, 'DuplicateKeyException')){
+                        this.$Notice.error({
+                            title: (this.$t('app.commonWords.saveFailed') as string),
+                            desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
+                        });
+                    }else {
+                        this.$Notice.error({
+                            title: (this.$t('app.commonWords.saveFailed') as string),
+                            desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
+                        });
+                    }
+                } else {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.saveFailed') as string), desc: (item[this.majorInfoColName]?item[this.majorInfoColName]:"") + (this.$t('app.commonWords.saveFailed') as string) + '!' });
+                }
+            });
         }
         return successItems;
     }
@@ -2017,15 +2052,19 @@ export default class MainBase extends Vue implements ControlInterface {
         let startOp = (val:boolean)=>{
             if(falg.isPast){
                 if(opValue){
-                    falg.isPast = falg && val;
+                    falg.isPast = falg.isPast && val;
                 }else{
-                    falg.isPast = falg || val;
+                    falg.isPast = falg.isPast || val;
                 }
             }else{
                 falg.isPast = val;
             }
         }
         rule[name].forEach((item:any) => {
+            if((value === null || value === undefined || value === "") && (item.type != 'GROUP')){
+                startOp(true);
+                return falg;
+            }
             // 常规规则
             if(item.type == 'SIMPLE'){
                 startOp(!this.$verify.checkFieldSimpleRule(value,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.curEditRowData,item.isKeyCond));
@@ -2048,7 +2087,7 @@ export default class MainBase extends Vue implements ControlInterface {
             }
             // 分组
             if(item.type == 'GROUP'){
-                falg = this.verifyDeRules('group',item,"AND",value)
+                falg = this.verifyDeRules('group',item,item.condOP?item.condOP:"AND",value)
                 if(item.isNotMode){
                    falg.isPast = !falg.isPast;
                 }

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

@@ -267,7 +267,6 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
-
     /**
      * 代码表服务对象
      *
@@ -276,6 +275,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */  
     public codeListService:CodeListService = new CodeListService({ $store: this.$store });
 
+    /**
+     * 主信息表格列
+     *
+     * @type {string}
+     * @memberof MainBase
+     */  
+    public majorInfoColName:string = "definitionname";
+
     /**
      * 界面UI服务对象
      *
@@ -790,16 +797,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.errorMessages = [];
         let validateState = true;
         let index = -1;
-        for(let item of this.items){
-          index++;
-          if(item.rowDataState === "create" || item.rowDataState === "update"){
-            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);
-              }
+        for (let item of this.items) {
+            let tempMessage: string = '';
+            index++;
+            if (item.rowDataState === "create" || item.rowDataState === "update") {
+                for (let property of Object.keys(this.rules)) {
+                    if (!await this.validate(property, item, index)) {
+                        validateState = false;
+                        tempMessage = tempMessage + '<p>' + this.gridItemsModel[index][property].error + '<p>';
+                    }
+                }
             }
-          }
+            this.errorMessages.push(tempMessage);
         }
         return validateState;
     }
@@ -936,9 +945,9 @@ export default class MainBase extends Vue implements ControlInterface {
         });
 
         if (_datas.length < 5) {
-            dataInfo = dataInfo + ' '+(this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string)+(this.$t('app.gridpage.data') as string);
+            dataInfo = dataInfo + ' ' + (this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string) + (this.$t('app.gridpage.data') as string);
         } else {
-            dataInfo = dataInfo + '...' + ' '+(this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.desc2') as string);
+            dataInfo = ' ... ' + (this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string) + (this.$t('app.gridpage.data') as string);
         }
 
         const removeData = () => {
@@ -1250,7 +1259,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
                 if (Object.is('load', action)) {
-                    this.load(data);
+                    this.load(data,true);
                 }
                 if (Object.is('remove', action)) {
                     this.remove(data);
@@ -1743,11 +1752,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         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 });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: this.errorMessages[0] });
             } else {
                 this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.rulesException') as string) });
             }
@@ -1788,10 +1793,46 @@ export default class MainBase extends Vue implements ControlInterface {
         if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
-          errorItems.forEach((item:any,index:number)=>{
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: errorMessage[index].data.message });
-            console.error(errorMessage[index]);
-          });
+            errorItems.forEach((item: any, index: number) => {
+                if(errorMessage[index] && errorMessage[index].data) {
+                    if(Object.is(errorMessage[index].data.errorKey, 'DupCheck')) {
+                        let errorProp: string = errorMessage[index].data.message.match(/\[[a-zA-Z]*\]/)[0];
+                        let name: string = errorProp ? this.service.getNameByProp(errorProp.substr(1, errorProp.length-2)) : '';
+                        if(name) {
+                            let desc: any = this.allColumns.find((column: any) =>{
+                                return Object.is(column.name, name);
+                            });
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
+                            });
+                        } else {
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
+                            });
+                        }
+                    } else if(Object.is(errorMessage[index].data.errorKey, 'DuplicateKeyException')){
+                        let name: string = this.service.getNameByProp("definitionkey");
+                        if(name){
+                            let desc: any = this.allColumns.find((column: any) =>{
+                                return Object.is(column.name, name);
+                            });
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
+                            });
+                        }
+                    }else {
+                        this.$Notice.error({
+                            title: (this.$t('app.commonWords.saveFailed') as string),
+                            desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
+                        });
+                    }
+                } else {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.saveFailed') as string), desc: (item[this.majorInfoColName]?item[this.majorInfoColName]:"") + (this.$t('app.commonWords.saveFailed') as string) + '!' });
+                }
+            });
         }
         return successItems;
     }
@@ -2050,15 +2091,19 @@ export default class MainBase extends Vue implements ControlInterface {
         let startOp = (val:boolean)=>{
             if(falg.isPast){
                 if(opValue){
-                    falg.isPast = falg && val;
+                    falg.isPast = falg.isPast && val;
                 }else{
-                    falg.isPast = falg || val;
+                    falg.isPast = falg.isPast || val;
                 }
             }else{
                 falg.isPast = val;
             }
         }
         rule[name].forEach((item:any) => {
+            if((value === null || value === undefined || value === "") && (item.type != 'GROUP')){
+                startOp(true);
+                return falg;
+            }
             // 常规规则
             if(item.type == 'SIMPLE'){
                 startOp(!this.$verify.checkFieldSimpleRule(value,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.curEditRowData,item.isKeyCond));
@@ -2081,7 +2126,7 @@ export default class MainBase extends Vue implements ControlInterface {
             }
             // 分组
             if(item.type == 'GROUP'){
-                falg = this.verifyDeRules('group',item,"AND",value)
+                falg = this.verifyDeRules('group',item,item.condOP?item.condOP:"AND",value)
                 if(item.isNotMode){
                    falg.isPast = !falg.isPast;
                 }

app_web/src/widgets/wftask/main-grid/main-grid-base.vue

@@ -325,7 +325,6 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
-
     /**
      * 代码表服务对象
      *
@@ -334,6 +333,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */  
     public codeListService:CodeListService = new CodeListService({ $store: this.$store });
 
+    /**
+     * 主信息表格列
+     *
+     * @type {string}
+     * @memberof MainBase
+     */  
+    public majorInfoColName:string = "taskname";
+
     /**
      * 界面UI服务对象
      *
@@ -886,16 +893,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.errorMessages = [];
         let validateState = true;
         let index = -1;
-        for(let item of this.items){
-          index++;
-          if(item.rowDataState === "create" || item.rowDataState === "update"){
-            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);
-              }
+        for (let item of this.items) {
+            let tempMessage: string = '';
+            index++;
+            if (item.rowDataState === "create" || item.rowDataState === "update") {
+                for (let property of Object.keys(this.rules)) {
+                    if (!await this.validate(property, item, index)) {
+                        validateState = false;
+                        tempMessage = tempMessage + '<p>' + this.gridItemsModel[index][property].error + '<p>';
+                    }
+                }
             }
-          }
+            this.errorMessages.push(tempMessage);
         }
         return validateState;
     }
@@ -1020,7 +1029,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         let dataInfo = '';
         _datas.forEach((record: any, index: number) => {
-            let srfmajortext = record.name;
+            let srfmajortext = record.taskname;
             if (index < 5) {
                 if (!Object.is(dataInfo, '')) {
                     dataInfo += '、';
@@ -1032,9 +1041,9 @@ export default class MainBase extends Vue implements ControlInterface {
         });
 
         if (_datas.length < 5) {
-            dataInfo = dataInfo + ' '+(this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string)+(this.$t('app.gridpage.data') as string);
+            dataInfo = dataInfo + ' ' + (this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string) + (this.$t('app.gridpage.data') as string);
         } else {
-            dataInfo = dataInfo + '...' + ' '+(this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.desc2') as string);
+            dataInfo = ' ... ' + (this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string) + (this.$t('app.gridpage.data') as string);
         }
 
         const removeData = () => {
@@ -1338,7 +1347,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
                 if (Object.is('load', action)) {
-                    this.load(data);
+                    this.load(data,true);
                 }
                 if (Object.is('remove', action)) {
                     this.remove(data);
@@ -1836,11 +1845,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         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 });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: this.errorMessages[0] });
             } else {
                 this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.rulesException') as string) });
             }
@@ -1881,10 +1886,46 @@ export default class MainBase extends Vue implements ControlInterface {
         if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
-          errorItems.forEach((item:any,index:number)=>{
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: errorMessage[index].data.message });
-            console.error(errorMessage[index]);
-          });
+            errorItems.forEach((item: any, index: number) => {
+                if(errorMessage[index] && errorMessage[index].data) {
+                    if(Object.is(errorMessage[index].data.errorKey, 'DupCheck')) {
+                        let errorProp: string = errorMessage[index].data.message.match(/\[[a-zA-Z]*\]/)[0];
+                        let name: string = errorProp ? this.service.getNameByProp(errorProp.substr(1, errorProp.length-2)) : '';
+                        if(name) {
+                            let desc: any = this.allColumns.find((column: any) =>{
+                                return Object.is(column.name, name);
+                            });
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
+                            });
+                        } else {
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
+                            });
+                        }
+                    } else if(Object.is(errorMessage[index].data.errorKey, 'DuplicateKeyException')){
+                        let name: string = this.service.getNameByProp("taskid");
+                        if(name){
+                            let desc: any = this.allColumns.find((column: any) =>{
+                                return Object.is(column.name, name);
+                            });
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
+                            });
+                        }
+                    }else {
+                        this.$Notice.error({
+                            title: (this.$t('app.commonWords.saveFailed') as string),
+                            desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
+                        });
+                    }
+                } else {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.saveFailed') as string), desc: (item[this.majorInfoColName]?item[this.majorInfoColName]:"") + (this.$t('app.commonWords.saveFailed') as string) + '!' });
+                }
+            });
         }
         return successItems;
     }
@@ -2143,15 +2184,19 @@ export default class MainBase extends Vue implements ControlInterface {
         let startOp = (val:boolean)=>{
             if(falg.isPast){
                 if(opValue){
-                    falg.isPast = falg && val;
+                    falg.isPast = falg.isPast && val;
                 }else{
-                    falg.isPast = falg || val;
+                    falg.isPast = falg.isPast || val;
                 }
             }else{
                 falg.isPast = val;
             }
         }
         rule[name].forEach((item:any) => {
+            if((value === null || value === undefined || value === "") && (item.type != 'GROUP')){
+                startOp(true);
+                return falg;
+            }
             // 常规规则
             if(item.type == 'SIMPLE'){
                 startOp(!this.$verify.checkFieldSimpleRule(value,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.curEditRowData,item.isKeyCond));
@@ -2174,7 +2219,7 @@ export default class MainBase extends Vue implements ControlInterface {
             }
             // 分组
             if(item.type == 'GROUP'){
-                falg = this.verifyDeRules('group',item,"AND",value)
+                falg = this.verifyDeRules('group',item,item.condOP?item.condOP:"AND",value)
                 if(item.isNotMode){
                    falg.isPast = !falg.isPast;
                 }

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

@@ -265,7 +265,6 @@ export default class MainBase extends Vue implements ControlInterface {
     }
 
 
-
     /**
      * 代码表服务对象
      *
@@ -274,6 +273,14 @@ export default class MainBase extends Vue implements ControlInterface {
      */  
     public codeListService:CodeListService = new CodeListService({ $store: this.$store });
 
+    /**
+     * 主信息表格列
+     *
+     * @type {string}
+     * @memberof MainBase
+     */  
+    public majorInfoColName:string = "personname";
+
     /**
      * 界面UI服务对象
      *
@@ -788,16 +795,18 @@ export default class MainBase extends Vue implements ControlInterface {
         this.errorMessages = [];
         let validateState = true;
         let index = -1;
-        for(let item of this.items){
-          index++;
-          if(item.rowDataState === "create" || item.rowDataState === "update"){
-            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);
-              }
+        for (let item of this.items) {
+            let tempMessage: string = '';
+            index++;
+            if (item.rowDataState === "create" || item.rowDataState === "update") {
+                for (let property of Object.keys(this.rules)) {
+                    if (!await this.validate(property, item, index)) {
+                        validateState = false;
+                        tempMessage = tempMessage + '<p>' + this.gridItemsModel[index][property].error + '<p>';
+                    }
+                }
             }
-          }
+            this.errorMessages.push(tempMessage);
         }
         return validateState;
     }
@@ -922,7 +931,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         let dataInfo = '';
         _datas.forEach((record: any, index: number) => {
-            let srfmajortext = record.displayname;
+            let srfmajortext = record.personname;
             if (index < 5) {
                 if (!Object.is(dataInfo, '')) {
                     dataInfo += '、';
@@ -934,9 +943,9 @@ export default class MainBase extends Vue implements ControlInterface {
         });
 
         if (_datas.length < 5) {
-            dataInfo = dataInfo + ' '+(this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string)+(this.$t('app.gridpage.data') as string);
+            dataInfo = dataInfo + ' ' + (this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string) + (this.$t('app.gridpage.data') as string);
         } else {
-            dataInfo = dataInfo + '...' + ' '+(this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.desc2') as string);
+            dataInfo = ' ... ' + (this.$t('app.gridpage.totle') as string) + _datas.length + (this.$t('app.gridpage.records') as string) + (this.$t('app.gridpage.data') as string);
         }
 
         const removeData = () => {
@@ -1240,7 +1249,7 @@ export default class MainBase extends Vue implements ControlInterface {
                     return;
                 }
                 if (Object.is('load', action)) {
-                    this.load(data);
+                    this.load(data,true);
                 }
                 if (Object.is('remove', action)) {
                     this.remove(data);
@@ -1733,11 +1742,7 @@ export default class MainBase extends Vue implements ControlInterface {
         }
         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 });
+                this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: this.errorMessages[0] });
             } else {
                 this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: (this.$t('app.commonWords.rulesException') as string) });
             }
@@ -1778,10 +1783,46 @@ export default class MainBase extends Vue implements ControlInterface {
         if(errorItems.length === 0 && successItems.length >0 && !this.isformDruipart){
             this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
         }else{
-          errorItems.forEach((item:any,index:number)=>{
-            this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: errorMessage[index].data.message });
-            console.error(errorMessage[index]);
-          });
+            errorItems.forEach((item: any, index: number) => {
+                if(errorMessage[index] && errorMessage[index].data) {
+                    if(Object.is(errorMessage[index].data.errorKey, 'DupCheck')) {
+                        let errorProp: string = errorMessage[index].data.message.match(/\[[a-zA-Z]*\]/)[0];
+                        let name: string = errorProp ? this.service.getNameByProp(errorProp.substr(1, errorProp.length-2)) : '';
+                        if(name) {
+                            let desc: any = this.allColumns.find((column: any) =>{
+                                return Object.is(column.name, name);
+                            });
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
+                            });
+                        } else {
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
+                            });
+                        }
+                    } else if(Object.is(errorMessage[index].data.errorKey, 'DuplicateKeyException')){
+                        let name: string = this.service.getNameByProp("userid");
+                        if(name){
+                            let desc: any = this.allColumns.find((column: any) =>{
+                                return Object.is(column.name, name);
+                            });
+                            this.$Notice.error({
+                                title: (this.$t('app.commonWords.createFailed') as string),
+                                desc: (desc ? desc.label : '') + " : " + item[name] + (this.$t('app.commonWords.isExist') as string) + '!',
+                            });
+                        }
+                    }else {
+                        this.$Notice.error({
+                            title: (this.$t('app.commonWords.saveFailed') as string),
+                            desc: errorMessage[index].data.message?errorMessage[index].data.message:(this.$t('app.commonWords.sysException') as string),
+                        });
+                    }
+                } else {
+                    this.$Notice.error({ title: (this.$t('app.commonWords.saveFailed') as string), desc: (item[this.majorInfoColName]?item[this.majorInfoColName]:"") + (this.$t('app.commonWords.saveFailed') as string) + '!' });
+                }
+            });
         }
         return successItems;
     }
@@ -2040,15 +2081,19 @@ export default class MainBase extends Vue implements ControlInterface {
         let startOp = (val:boolean)=>{
             if(falg.isPast){
                 if(opValue){
-                    falg.isPast = falg && val;
+                    falg.isPast = falg.isPast && val;
                 }else{
-                    falg.isPast = falg || val;
+                    falg.isPast = falg.isPast || val;
                 }
             }else{
                 falg.isPast = val;
             }
         }
         rule[name].forEach((item:any) => {
+            if((value === null || value === undefined || value === "") && (item.type != 'GROUP')){
+                startOp(true);
+                return falg;
+            }
             // 常规规则
             if(item.type == 'SIMPLE'){
                 startOp(!this.$verify.checkFieldSimpleRule(value,item.condOP,item.paramValue,item.ruleInfo,item.paramType,this.curEditRowData,item.isKeyCond));
@@ -2071,7 +2116,7 @@ export default class MainBase extends Vue implements ControlInterface {
             }
             // 分组
             if(item.type == 'GROUP'){
-                falg = this.verifyDeRules('group',item,"AND",value)
+                falg = this.verifyDeRules('group',item,item.condOP?item.condOP:"AND",value)
                 if(item.isNotMode){
                    falg.isPast = !falg.isPast;
                 }

config.xml

@@ -37,6 +37,11 @@
 	  git clone -b master $para2 ibzwf/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzwf/
+      mvn clean package -Pweb
+      cd ibzwf-app/ibzwf-app-web
+      mvn -Pweb docker:build
+      mvn -Pweb docker:push
+      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzwf-app-web.yaml ibzlab-rt --with-registry-auth
       </command>
     </hudson.tasks.Shell>
   </builders>

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

@@ -12,6 +12,6 @@ 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
 
-EXPOSE 8080
+EXPOSE 30003
 
 ADD ibzwf-app-web.jar /ibzwf-app-web.jar

ibzwf-app/ibzwf-app-web/src/main/docker/ibzwf-app-web.yaml

@@ -3,9 +3,22 @@ services:
   ibzwf-app-web:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-app-web:latest
     ports:
-      - "8080:8080"
+      - "30003:30003"
     networks:
       - agent_network
+    environment:
+      - SPRING_CLOUD_NACOS_DISCOVERY_IP=172.16.180.237
+      - SERVER_PORT=30003
+      - SPRING_CLOUD_NACOS_DISCOVERY_SERVER-ADDR=172.16.102.211:8848
+      - SPRING_REDIS_HOST=172.16.100.243
+      - SPRING_REDIS_PORT=6379
+      - SPRING_REDIS_DATABASE=0
+      - SPRING_DATASOURCE_USERNAME=a_A_5d9d78509
+      - SPRING_DATASOURCE_PASSWORD=@6dEfb3@
+      - SPRING_DATASOURCE_URL=jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+      - SPRING_DATASOURCE_DRIVER-CLASS-NAME=com.mysql.jdbc.Driver
+      - SPRING_DATASOURCE_DEFAULTSCHEMA=a_A_5d9d78509
+      - NACOS=172.16.102.211:8848
     deploy:
       resources:
            limits:

ibzwf-app/ibzwf-app-web/src/main/java/cn/ibizlab/web/config/webSecurityConfig.java

@@ -53,6 +53,9 @@ public class webSecurityConfig extends WebSecurityConfigurerAdapter {
 
     @Value("${ibiz.file.previewpath:ibizutil/preview}")
     private String previewpath;
+    
+    @Value("${ibiz.auth.excludesPattern:}")
+    private String[] excludesPattern;
 
     @Autowired
     public void configureGlobal(AuthenticationManagerBuilder auth) throws Exception {
@@ -116,9 +119,15 @@ public class webSecurityConfig extends WebSecurityConfigurerAdapter {
                 // 文件操作
                 .antMatchers("/"+downloadpath+"/**").permitAll()
                 .antMatchers("/"+uploadpath).permitAll()
-                .antMatchers("/"+previewpath+"/**").permitAll()
-                // 所有请求都需要认证
-                .anyRequest().authenticated()
+                .antMatchers("/"+previewpath+"/**");
+
+        for (String excludePattern : excludesPattern) {
+            authenticationTokenFilter.addExcludePattern(excludePattern);
+            httpSecurity.authorizeRequests().antMatchers(excludePattern).permitAll();
+        }
+
+        // 所有请求都需要认证
+        httpSecurity.authorizeRequests().anyRequest().authenticated()
                 // 防止iframe 造成跨域
                 .and().headers().frameOptions().disable();