ibizdev提交

app_web/public/assets/json/data-dictionary.json

@@ -8,6 +8,7 @@
                 "id": "1",
                 "label": "是",
                 "text": "是",
+                "data":"",
                 "value": "1",
                 
                 "disabled": false
@@ -16,6 +17,7 @@
                 "id": "0",
                 "label": "否",
                 "text": "否",
+                "data":"",
                 "value": "0",
                 
                 "disabled": false

app_web/src/app-register.ts

@@ -69,6 +69,7 @@ import AppImagePreview from './components/app-image-preview/app-image-preview.vu
 import AppFormatData from './components/app-format-data/app-format-data.vue'
 import AppUploadFileInfo from './components/app-upload-file-info/app-upload-file-info.vue'
 import ContextMenu from './components/context-menu/context-menu'
+import AppColumnFormat from './components/app-column-format/app-column-format.vue'
 
 // 全局挂载UI实体服务注册中心
 window['uiServiceRegister'] = uiServiceRegister;
@@ -147,5 +148,6 @@ export const AppComponents = {
         v.component('app-format-data', AppFormatData);
         v.component('app-upload-file-info', AppUploadFileInfo);
         v.component('context-menu',ContextMenu);
+        v.component('app-column-format',AppColumnFormat);
     },
 };
\ No newline at end of file

app_web/src/components/app-checkbox-list/app-checkbox-list.vue

@@ -43,7 +43,7 @@ export default class AppCheckBox extends Vue {
      * @type {string}
      * @memberof AppCheckBox
      */
-    @Prop({default:';'}) public valueSeparator?: string;
+    @Prop({default:','}) public valueSeparator?: string;
 
     /**
      * 是否禁用
@@ -97,28 +97,6 @@ export default class AppCheckBox extends Vue {
         }
     }
 
-    /**
-     * 分隔符
-     *
-     * @type {*}
-     * @memberof AppCheckBox
-     */
-    @Prop() separator: any;
-
-    /**
-     * 获取分隔符
-     *
-     * @readonly
-     * @memberof AppCheckBox
-     */
-    get currentseparator() {
-        if (this.separator) {
-            return this.separator;
-        } else {
-            return ';';
-        }
-    }
-
     /** 
      * 选中值
      *

app_web/src/components/app-column-format/app-column-format.less

+.app-column-format{
+    display: inline-block;
+}
\ No newline at end of file

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

+<template>
+  <div class="app-column-format">
+      {{text}}
+  </div>
+</template>
+
+<script lang="ts">
+import { Vue, Component, Prop, Model, Emit, Watch } from "vue-property-decorator";
+
+/**
+ * 表格列格式化json数组，数据格式为"[{"srfkey":"001","srfmajortext":"TEST1"},{"srfkey":"002","srfmajortext":"TEST2"}......]"
+ */
+@Component({
+})
+export default class AppColumnFormat extends Vue {
+    
+    /**
+     * 值
+     * @type {any}
+     * @memberof AppColumnFormat
+     */
+    @Prop() public value?: any;
+
+    /**
+     * 显示文本
+     * @type {any}
+     * @memberof AppColumnFormat
+     */
+    get text(){
+      if(this.value){
+        let returnStr:string = "";
+        let tempData:Array<any> =[];
+        if(typeof(this.value) === 'string'){
+          tempData= JSON.parse(this.value);
+        }else{
+          tempData = JSON.parse(JSON.stringify(this.value));
+        }
+        tempData.forEach((item:any,index:number) =>{
+          if(index >0){
+            returnStr +="、";
+          }
+          returnStr +=item.srfmajortext;
+        })
+        return returnStr;
+      }else{
+        return "";
+      }
+    }
+
+
+
+
+}
+</script>
+
+<style lang='less'>
+@import "./app-column-format.less";
+</style>
\ No newline at end of file

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

@@ -55,14 +55,14 @@ export default class AppSpan extends Vue {
      * @type {boolean}
      * @memberof AppSpan
      */
-    @Prop({default:"、"}) public textSeparator?: string;
+    @Prop({default:'、'}) public textSeparator?: string;
 
     /**
      * 值分隔符
      * @type {boolean}
      * @memberof AppSpan
      */
-    @Prop({default:";"}) public valueSeparator?: string;
+    @Prop({default:','}) public valueSeparator?: string;
 
     /**
      * 监控表单属性 data 值

app_web/src/components/codelist/codelist.vue

@@ -61,14 +61,14 @@ export default class CodeList extends Vue {
      * @type {boolean}
      * @memberof SelectPicker
      */
-    @Prop({default:"、"}) public textSeparator?: string;
+    @Prop({default:'、'}) public textSeparator?: string;
 
     /**
      * 值分隔符
      * @type {boolean}
      * @memberof SelectPicker
      */
-    @Prop({default:";"}) public valueSeparator?: string;
+    @Prop({default:','}) public valueSeparator?: string;
 
     /**
      * 是否为空

app_web/src/components/dropdown-list-mpicker/dropdown-list-mpicker.vue

@@ -60,7 +60,7 @@ export default class DropDownListMpicker extends Vue {
      * @type {string}
      * @memberof DropDownListMpicker
      */
-    @Prop({default:';'}) public valueSeparator?: string;
+    @Prop({default:','}) public valueSeparator?: string;
 
     /**
      * 是否禁用

app_web/src/components/login/login.vue

@@ -133,8 +133,12 @@ export default class Login extends Vue {
         post.then((response: any) => {
             if (response && response.status === 200) {
                 const data = response.data;
-                localStorage.setItem('token', data.token);
-                localStorage.setItem('user', JSON.stringify(data.user));
+                if(data && data.token){
+                    localStorage.setItem('token', data.token);
+                }
+                if(data && data.user){
+                    localStorage.setItem('user', JSON.stringify(data.user));
+                }
                 const url: any = this.$route.query.redirect ? this.$route.query.redirect : '*';
                 this.$router.push({ path: url });
             }

app_web/src/mock/codelist/codelist.ts

@@ -16,6 +16,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: '1',
                 label: '是',
                 text: '是',
+                "data":"",
                 value: '1',
                 
                 disabled: false,
@@ -24,6 +25,7 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
                 id: '0',
                 label: '否',
                 text: '否',
+                "data":"",
                 value: '0',
                 
                 disabled: false,

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

@@ -299,7 +299,6 @@ export default class WFGroupEditViewBase extends Vue {
      * @memberof WFGroupEditViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *

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

@@ -8,8 +8,8 @@
         <div class='content-container'>
             <div class='view-top-messages'>
             </div>
-            <row style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='pull-left' style='max-width: 400px;margin-top:6px;' />
+            <div style='margin-bottom: 6px;'>
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -94,7 +94,7 @@
                         </tooltip>
                     </div>
                 </div>
-            </row>
+            </div>
             <view_searchform 
                 :viewState="viewState"  
                 :viewparams="viewparams" 
@@ -322,7 +322,6 @@ export default class WFGroupGridViewBase extends Vue {
      * @memberof WFGroupGridViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *
@@ -359,6 +358,7 @@ export default class WFGroupGridViewBase extends Vue {
 
 
 
+
     /**
      * 视图引擎
      *
@@ -588,6 +588,7 @@ export default class WFGroupGridViewBase extends Vue {
             _this.loadModel();
         }
         
+
     }
 
 

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

@@ -299,7 +299,6 @@ export default class WFMemberEditViewBase extends Vue {
      * @memberof WFMemberEditViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *

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

@@ -8,8 +8,8 @@
         <div class='content-container'>
             <div class='view-top-messages'>
             </div>
-            <row style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='pull-left' style='max-width: 400px;margin-top:6px;' />
+            <div style='margin-bottom: 6px;'>
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -94,7 +94,7 @@
                         </tooltip>
                     </div>
                 </div>
-            </row>
+            </div>
             <view_searchform 
                 :viewState="viewState"  
                 :viewparams="viewparams" 
@@ -322,7 +322,6 @@ export default class WFMemberGridViewBase extends Vue {
      * @memberof WFMemberGridViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *
@@ -359,6 +358,7 @@ export default class WFMemberGridViewBase extends Vue {
 
 
 
+
     /**
      * 视图引擎
      *
@@ -588,6 +588,7 @@ export default class WFMemberGridViewBase extends Vue {
             _this.loadModel();
         }
         
+
     }
 
 

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

@@ -299,7 +299,6 @@ export default class WFProcessDefinitionEditViewBase extends Vue {
      * @memberof WFProcessDefinitionEditViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *

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

@@ -8,8 +8,8 @@
         <div class='content-container'>
             <div class='view-top-messages'>
             </div>
-            <row style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='pull-left' style='max-width: 400px;margin-top:6px;' />
+            <div style='margin-bottom: 6px;'>
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -94,7 +94,7 @@
                         </tooltip>
                     </div>
                 </div>
-            </row>
+            </div>
             <view_searchform 
                 :viewState="viewState"  
                 :viewparams="viewparams" 
@@ -322,7 +322,6 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
      * @memberof WFProcessDefinitionGridViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *
@@ -359,6 +358,7 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
 
 
 
+
     /**
      * 视图引擎
      *
@@ -588,6 +588,7 @@ export default class WFProcessDefinitionGridViewBase extends Vue {
             _this.loadModel();
         }
         
+
     }
 
 

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

@@ -229,7 +229,6 @@ export default class WFREModelEditViewBase extends Vue {
      * @memberof WFREModelEditViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *

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

@@ -299,7 +299,6 @@ export default class WFUserEditViewBase extends Vue {
      * @memberof WFUserEditViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *

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

@@ -8,8 +8,8 @@
         <div class='content-container'>
             <div class='view-top-messages'>
             </div>
-            <row style='margin-bottom: 6px;'>
-                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='pull-left' style='max-width: 400px;margin-top:6px;' />
+            <div style='margin-bottom: 6px;'>
+                <i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' />
                 <div class='pull-right'>
                     <div class='toolbar-container'>
                         <tooltip :transfer="true" :max-width="600">
@@ -94,7 +94,7 @@
                         </tooltip>
                     </div>
                 </div>
-            </row>
+            </div>
             <view_searchform 
                 :viewState="viewState"  
                 :viewparams="viewparams" 
@@ -322,7 +322,6 @@ export default class WFUserGridViewBase extends Vue {
      * @memberof WFUserGridViewBase
      */
     public viewState: Subject<ViewState> = new Subject();
-
     /**
      * 工具栏模型
      *
@@ -359,6 +358,7 @@ export default class WFUserGridViewBase extends Vue {
 
 
 
+
     /**
      * 视图引擎
      *
@@ -588,6 +588,7 @@ export default class WFUserGridViewBase extends Vue {
             _this.loadModel();
         }
         
+
     }
 
 

app_web/src/styles/default.less

@@ -213,6 +213,17 @@
       height: 100%;
     }
   }
+  >.view-card{
+    >.ivu-card-body{
+        >.content-container{
+            .quick-group-container,.quick-search-container,.quick-search-input{
+                float: left;
+                margin-top: 6px;
+                margin-bottom: 6px;
+            }
+        }
+    }
+  }
 }
 
 /***    END:多数据视图属性布局    ***/

app_web/src/utils/app-modal/app-modal.less

@@ -10,6 +10,9 @@
             .ivu-modal-body {
                 padding: 0;
                 height: calc(100% - 52px);
+                .view-container{
+                  padding: 15px;
+                }
             }
         }
     }

app_web/src/utils/auth-guard/auth-guard.ts

@@ -53,8 +53,18 @@ export class AuthGuard {
             const get: Promise<any> = Http.getInstance().get(url);
             get.then((response: any) => {
                 if (response && response.status === 200) {
-                    const { data }: { data: any } = response;
+                    let { data }: { data: any } = response;
                     if (data) {
+                        // token认证把用户信息放入应用级数据
+                        if(localStorage.getItem('user')){
+                            let user:any = JSON.parse(localStorage.getItem('user') as string);
+                            let localAppData:any = {};
+                            if(user.sessionParams){
+                                localAppData = {context:user.sessionParams};
+                                Object.assign(localAppData,data);
+                            }
+                            data = JSON.parse(JSON.stringify(localAppData));
+                        }
                         router.app.$store.commit('addAppData', data);
                         // 提交统一资源数据
                         router.app.$store.dispatch('unifiedresource/commitResourceData', data);

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

@@ -13,6 +13,9 @@
         @row-class-name="onRowClassName($event)"  
         @row-dblclick="rowDBLClick($event)"  
         ref='multipleTable' :data="items" :show-header="!isHideHeader">
+            <template slot="empty">
+                无数据 
+            </template>
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
@@ -58,6 +61,8 @@
                         </div>
                     </poptip>
                 </span>
+                <span class="batch-toolbar">
+                </span>
                 <span class="page-button"><i-button icon="md-refresh" :title="$t('app.gridpage.refresh')" @click="pageRefresh()"></i-button></span>&nbsp;
                 <span>
                     {{$t('app.gridpage.show')}}&nbsp;
@@ -467,6 +472,8 @@ export default class MainBase extends Vue implements ControlInterface {
     public stopRowClick: boolean = false;
 
 
+
+
     /**
      * 表格是否显示
      *

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

@@ -13,6 +13,9 @@
         @row-class-name="onRowClassName($event)"  
         @row-dblclick="rowDBLClick($event)"  
         ref='multipleTable' :data="items" :show-header="!isHideHeader">
+            <template slot="empty">
+                无数据 
+            </template>
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
@@ -51,6 +54,8 @@
                         </div>
                     </poptip>
                 </span>
+                <span class="batch-toolbar">
+                </span>
                 <span class="page-button"><i-button icon="md-refresh" :title="$t('app.gridpage.refresh')" @click="pageRefresh()"></i-button></span>&nbsp;
                 <span>
                     {{$t('app.gridpage.show')}}&nbsp;
@@ -460,6 +465,8 @@ export default class MainBase extends Vue implements ControlInterface {
     public stopRowClick: boolean = false;
 
 
+
+
     /**
      * 表格是否显示
      *

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

@@ -13,6 +13,9 @@
         @row-class-name="onRowClassName($event)"  
         @row-dblclick="rowDBLClick($event)"  
         ref='multipleTable' :data="items" :show-header="!isHideHeader">
+            <template slot="empty">
+                无数据 
+            </template>
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
@@ -74,6 +77,8 @@
                         </div>
                     </poptip>
                 </span>
+                <span class="batch-toolbar">
+                </span>
                 <span class="page-button"><i-button icon="md-refresh" :title="$t('app.gridpage.refresh')" @click="pageRefresh()"></i-button></span>&nbsp;
                 <span>
                     {{$t('app.gridpage.show')}}&nbsp;
@@ -483,6 +488,8 @@ export default class MainBase extends Vue implements ControlInterface {
     public stopRowClick: boolean = false;
 
 
+
+
     /**
      * 表格是否显示
      *
@@ -881,7 +888,7 @@ export default class MainBase extends Vue implements ControlInterface {
             codelistType : 'STATIC',
             renderMode: 'other',
             textSeparator: '、',
-            valueSeparator: ';',
+            valueSeparator: ',',
           },
         ];
         let _this = this;

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

@@ -13,6 +13,9 @@
         @row-class-name="onRowClassName($event)"  
         @row-dblclick="rowDBLClick($event)"  
         ref='multipleTable' :data="items" :show-header="!isHideHeader">
+            <template slot="empty">
+                无数据 
+            </template>
             <template v-if="!isSingleSelect">
                 <el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
             </template>
@@ -58,6 +61,8 @@
                         </div>
                     </poptip>
                 </span>
+                <span class="batch-toolbar">
+                </span>
                 <span class="page-button"><i-button icon="md-refresh" :title="$t('app.gridpage.refresh')" @click="pageRefresh()"></i-button></span>&nbsp;
                 <span>
                     {{$t('app.gridpage.show')}}&nbsp;
@@ -467,6 +472,8 @@ export default class MainBase extends Vue implements ControlInterface {
     public stopRowClick: boolean = false;
 
 
+
+
     /**
      * 表格是否显示
      *

config.xml

@@ -37,11 +37,11 @@
 	  git clone -b master $para2 ibzwf/
       export NODE_OPTIONS=--max-old-space-size=4096
       cd ibzwf/
-      mvn clean package -Papi
-      cd ibzwf-provider/ibzwf-provider-api
-      mvn -Papi docker:build
-      mvn -Papi docker:push
-      docker -H $para1 stack deploy --compose-file=src/main/docker/ibzwf-provider-api.yaml ibzlab-rt --with-registry-auth      
+      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

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_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,11 @@ 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
     deploy:
       mode: replicated
       replicas: 1

ibzwf-app/ibzwf-app-web/src/main/resources/application-web-dev.yml

 server:
-  port: 8080
+  port: 30003
\ No newline at end of file

ibzwf-app/ibzwf-app-web/src/main/resources/application-web-prod.yml

 server:
-  port: 8080
+  port: 30003
 
 #zuul网关路由设置
 zuul:

ibzwf-boot/src/main/resources/application-dev.yml

 server:
-  port: 40003
+  port: 8080
 

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

@@ -9,6 +9,6 @@ CMD echo "The application will start in ${IBZ_SLEEP}s..." && \
     sleep ${IBZ_SLEEP} && \
     java ${JAVA_OPTS} -Djava.security.egd=file:/dev/./urandom -jar /ibzwf-provider-api.jar
 
-EXPOSE 40003
+EXPOSE 8081
 
 ADD ibzwf-provider-api.jar /ibzwf-provider-api.jar

ibzwf-provider/ibzwf-provider-api/src/main/docker/ibzwf-provider-api.yaml

@@ -3,11 +3,9 @@ services:
   ibzwf-provider-api:
     image: registry.cn-shanghai.aliyuncs.com/ibizsys/ibzwf-provider-api:latest
     ports:
-      - "40003:40003"
+      - "8081:8081"
     networks:
       - agent_network
-    environment:
-      SPRING_CLOUD_NACOS_DISCOVERY_IP: 172.16.180.237
     deploy:
       mode: replicated
       replicas: 1

ibzwf-provider/ibzwf-provider-api/src/main/resources/application-api-dev.yml

 server:
-  port: 40003
+  port: 8081
\ No newline at end of file

ibzwf-provider/ibzwf-provider-api/src/main/resources/application-api-prod.yml

 server:
-  port: 40003
+  port: 8081

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

@@ -32,7 +32,7 @@ public class PermissionSyncJob implements ApplicationRunner {
     @Value("${ibiz.enablePermissionValid:false}")
     boolean enablePermissionValid;  //是否开启权限校验
 
-    @Value("${ibiz.systemid:2C40DFCD-0DF5-47BF-91A5-C45F810B0001}")
+    @Value("${ibiz.systemid:0A91C1B1-3B67-4EDA-9572-5DB491871FEE}")
     private String systemId;
 
     @Override