ibizdev提交

app_web/CHANGELOG.md

+## v7.0.0-alpha.3 [2020-5-10]
+
+### Bug修复
+
+分页导航栏传递srfparentdename和srfparentkey问题
+
+提交流程、启动流程刷新表格数据问题
+
+修复视图自定义导航参数大小写问题
+
+修复批添加功能
+
+修复树部件查询数据集合异常处理
+
+修复图表排序问题
+
+修复富文本国际化切换失效
+
+### 功能新增及优化
+
+#### 模板
+
+搜索面板布局优化
+
+表格checkbox宽度优化
+
+选择类视图不显示标题
+
+补充树节点关系导航上下文，导航参数上下文
+
+#### 基础文件
+
+登录页面调整
+
 ## v7.0.0-alpha.2 [2020-5-7]
 
 ### Bug修复
@@ -31,5 +65,3 @@
 ## v7.0.0-alpha.1 [2020-4-29]
 
 初始化文件
-
-

app_web/src/environments/environment.ts

@@ -4,7 +4,7 @@ export const Environment = {
     // 应用名称
     AppName: 'web',
     // 应用 title
-    AppTitle: 'gateway',
+    AppTitle: '统一工作流',
     // 应用基础路径
     BaseUrl: '../',
     // 系统名称

app_web/src/mock/app/wfindex-view-appmenu/wfindex-view-appmenu.ts

@@ -22,7 +22,7 @@ mock.onGet('v7/wfindex-viewappmenu').reply((config: any) => {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-random',
 	icon: '',
 	textcls: '',
 	appfunctag: '_2',
@@ -40,7 +40,7 @@ mock.onGet('v7/wfindex-viewappmenu').reply((config: any) => {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-arrow-circle-o-up',
 	icon: '',
 	textcls: '',
 	appfunctag: '_4',
@@ -58,7 +58,7 @@ mock.onGet('v7/wfindex-viewappmenu').reply((config: any) => {
 	hidden: false,
 	hidesidebar: false,
 	opendefault: false,
-	iconcls: '',
+	iconcls: 'fa fa-users',
 	icon: '',
 	textcls: '',
 	appfunctag: '_3',

app_web/src/pages/workflow/wfgroup-grid-view/wfgroup-grid-view.less

@@ -17,3 +17,10 @@
         // this is less
 
 
+.view-container.degridview{
+  >.view-card.view-no-caption{
+    >.ivu-card-body{
+      height: 100%;
+    }
+  }
+}
\ No newline at end of file

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

@@ -70,7 +70,7 @@ export default class WFIndexViewBase extends Vue {
      * @type {Array<*>}
      * @memberof WFIndexViewBase
      */    
-    protected counterServiceArray:Array<any> = [];
+    public counterServiceArray:Array<any> = [];
     
     /**
      * 数据变化
@@ -80,7 +80,7 @@ export default class WFIndexViewBase extends Vue {
      * @memberof WFIndexViewBase
      */
     @Emit() 
-    protected viewDatasChange(val: any):any {
+    public viewDatasChange(val: any):any {
         return val;
     }
 
@@ -90,7 +90,7 @@ export default class WFIndexViewBase extends Vue {
      * @type {string}
      * @memberof WFIndexViewBase
      */
-    @Prop() protected viewdata!: string;
+    @Prop() public viewdata!: string;
 
     /**
      * 传入视图参数
@@ -98,7 +98,7 @@ export default class WFIndexViewBase extends Vue {
      * @type {string}
      * @memberof WFIndexViewBase
      */
-    @Prop() protected viewparam!: string;
+    @Prop() public viewparam!: string;
 
     /**
      * 视图默认使用
@@ -106,7 +106,7 @@ export default class WFIndexViewBase extends Vue {
      * @type {boolean}
      * @memberof WFIndexViewBase
      */
-    @Prop({ default: true }) protected viewDefaultUsage!: boolean;
+    @Prop({ default: true }) public viewDefaultUsage!: boolean;
 
 	/**
 	 * 视图标识
@@ -114,7 +114,7 @@ export default class WFIndexViewBase extends Vue {
 	 * @type {string}
 	 * @memberof WFIndexViewBase
 	 */
-	protected viewtag: string = '380EA9D7-5F04-46C1-9E82-2877EE29336A';
+	public viewtag: string = '380EA9D7-5F04-46C1-9E82-2877EE29336A';
 
 	/**
 	 * 自定义视图导航上下文集合
@@ -122,7 +122,7 @@ export default class WFIndexViewBase extends Vue {
 	 * @type {*}
 	 * @memberof WFIndexViewBase
 	 */
-    protected customViewNavContexts:any ={
+    public customViewNavContexts:any ={
     };
 
 	/**
@@ -131,7 +131,7 @@ export default class WFIndexViewBase extends Vue {
 	 * @type {*}
 	 * @memberof WFIndexViewBase
 	 */
-    protected customViewParams:any ={
+    public customViewParams:any ={
     };
 
     /**
@@ -140,7 +140,7 @@ export default class WFIndexViewBase extends Vue {
      * @type {*}
      * @memberof WFIndexViewBase
      */
-    protected model: any = {
+    public model: any = {
         srfCaption: 'app.views.wfindexview.caption',
         srfTitle: 'app.views.wfindexview.title',
         srfSubTitle: 'app.views.wfindexview.subtitle',
@@ -188,7 +188,7 @@ export default class WFIndexViewBase extends Vue {
      * @type {*}
      * @memberof WFIndexViewBase
      */
-    protected containerModel: any = {
+    public containerModel: any = {
         view_appmenu: { name: 'appmenu', type: 'APPMENU' },
     };
 
@@ -211,11 +211,11 @@ export default class WFIndexViewBase extends Vue {
     /**
      * 视图状态订阅对象
      *
-     * @private
+     * @public
      * @type {Subject<{action: string, data: any}>}
      * @memberof WFIndexViewBase
      */
-    protected viewState: Subject<ViewState> = new Subject();
+    public viewState: Subject<ViewState> = new Subject();
 
 
 
@@ -223,10 +223,10 @@ export default class WFIndexViewBase extends Vue {
     /**
      * 引擎初始化
      *
-     * @private
+     * @public
      * @memberof WFIndexViewBase
      */
-    private engineInit(): void {
+    public engineInit(): void {
     }
 
     /**
@@ -235,7 +235,7 @@ export default class WFIndexViewBase extends Vue {
      * @type {*}
      * @memberof WFIndexViewBase
      */
-    protected context:any = {};
+    public context:any = {};
 
     /**
      * 视图参数
@@ -243,15 +243,15 @@ export default class WFIndexViewBase extends Vue {
      * @type {*}
      * @memberof WFIndexViewBase
      */
-    protected viewparams:any = {};
+    public viewparams:any = {};
 
     /**
      * 解析视图参数
      *
-     * @private
+     * @public
      * @memberof WFIndexViewBase
      */
-    private parseViewParam(): void {
+    public parseViewParam(): void {
         for(let key in this.context){
             delete this.context[key];
         }
@@ -317,14 +317,14 @@ export default class WFIndexViewBase extends Vue {
 		// 直接值直接赋值
 		if(curNavData.isRawValue){
 			if(Object.is(curNavData.value,"null") || Object.is(curNavData.value,"")){
-                Object.defineProperty(tempData, item, {
+                Object.defineProperty(tempData, item.toLowerCase(), {
                     value: null,
                     writable : true,
                     enumerable : true,
                     configurable : true
                 });
             }else{
-                Object.defineProperty(tempData, item, {
+                Object.defineProperty(tempData, item.toLowerCase(), {
                     value: curNavData.value,
                     writable : true,
                     enumerable : true,
@@ -334,7 +334,7 @@ export default class WFIndexViewBase extends Vue {
 		}else{
 			// 先从导航上下文取数，没有再从导航参数（URL）取数，如果导航上下文和导航参数都没有则为null
 			if(this.context[(curNavData.value).toLowerCase()]){
-				Object.defineProperty(tempData, item, {
+				Object.defineProperty(tempData, item.toLowerCase(), {
 					value: this.context[(curNavData.value).toLowerCase()],
 					writable : true,
 					enumerable : true,
@@ -342,14 +342,14 @@ export default class WFIndexViewBase extends Vue {
 				});
 			}else{
 				if(this.viewparams[(curNavData.value).toLowerCase()]){
-					Object.defineProperty(tempData, item, {
+					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: this.viewparams[(curNavData.value).toLowerCase()],
 						writable : true,
 						enumerable : true,
 						configurable : true
 					});
 				}else{
-					Object.defineProperty(tempData, item, {
+					Object.defineProperty(tempData, item.toLowerCase(), {
 						value: null,
 						writable : true,
 						enumerable : true,
@@ -366,7 +366,7 @@ export default class WFIndexViewBase extends Vue {
      *
      * @memberof WFIndexViewBase
      */
-    protected created() {
+    public created() {
         this.afterCreated();
     }
 
@@ -375,7 +375,7 @@ export default class WFIndexViewBase extends Vue {
      *
      * @memberof WFIndexViewBase
      */    
-    protected afterCreated(){
+    public afterCreated(){
         const secondtag = this.$util.createUUID();
         this.$store.commit('viewaction/createdView', { viewtag: this.viewtag, secondtag: secondtag });
         this.viewtag = secondtag;
@@ -388,7 +388,7 @@ export default class WFIndexViewBase extends Vue {
      *
      * @memberof WFIndexViewBase
      */
-    protected beforeDestroy() {
+    public beforeDestroy() {
         this.$store.commit('viewaction/removeView', this.viewtag);
     }
 
@@ -397,7 +397,7 @@ export default class WFIndexViewBase extends Vue {
      *
      * @memberof WFIndexViewBase
      */
-    protected mounted() {
+    public mounted() {
         this.afterMounted();
     }
 
@@ -406,7 +406,7 @@ export default class WFIndexViewBase extends Vue {
      * 
      * @memberof WFIndexViewBase
      */
-    protected afterMounted(){
+    public afterMounted(){
         const _this: any = this;
         _this.engineInit();
         if (_this.loadModel && _this.loadModel instanceof Function) {
@@ -427,7 +427,7 @@ export default class WFIndexViewBase extends Vue {
      * @param {any[]} args
      * @memberof WFIndexViewBase
      */
-    protected closeView(args: any[]): void {
+    public closeView(args: any[]): void {
         let _view: any = this;
         if (_view.viewdata) {
             _view.$emit('viewdataschange', [args]);
@@ -440,11 +440,11 @@ export default class WFIndexViewBase extends Vue {
     /**
      * 菜单位置
      *
-     * @private
+     * @public
      * @type {string}
      * @memberof WFIndexViewBase
      */
-    private mode: string ='vertical';
+    public mode: string ='vertical';
 
     /**
      * 当前主题

app_web/src/pages/workflow/wfmember-grid-view/wfmember-grid-view.less

@@ -17,3 +17,10 @@
         // this is less
 
 
+.view-container.degridview{
+  >.view-card.view-no-caption{
+    >.ivu-card-body{
+      height: 100%;
+    }
+  }
+}
\ No newline at end of file

app_web/src/pages/workflow/wfprocess-definition-grid-view/wfprocess-definition-grid-view.less

@@ -17,3 +17,10 @@
         // this is less
 
 
+.view-container.degridview{
+  >.view-card.view-no-caption{
+    >.ivu-card-body{
+      height: 100%;
+    }
+  }
+}
\ No newline at end of file

app_web/src/pages/workflow/wfuser-grid-view/wfuser-grid-view.less

@@ -17,3 +17,10 @@
         // this is less
 
 
+.view-container.degridview{
+  >.view-card.view-no-caption{
+    >.ivu-card-body{
+      height: 100%;
+    }
+  }
+}
\ No newline at end of file

app_web/src/uiservice/wfgroup/wfgroup-ui-service-base.ts

@@ -17,49 +17,49 @@ export default class WFGroupUIServiceBase extends UIService {
      * 
      * @memberof  WFGroupUIServiceBase
      */
-    protected isEnableWorkflow:boolean = false;
+    public isEnableWorkflow:boolean = false;
 
     /**
      * 当前UI服务对应的数据服务对象
      * 
      * @memberof  WFGroupUIServiceBase
      */
-    protected dataService:WFGroupService = new WFGroupService();
+    public dataService:WFGroupService = new WFGroupService();
 
     /**
      * 所有关联视图
      * 
      * @memberof  WFGroupUIServiceBase
      */ 
-    protected allViewMap: Map<string, Object> = new Map();
+    public allViewMap: Map<string, Object> = new Map();
 
     /**
      * 状态值
      * 
      * @memberof  WFGroupUIServiceBase
      */ 
-    protected stateValue: number = 0;
+    public stateValue: number = 0;
 
     /**
      * 状态属性
      * 
      * @memberof  WFGroupUIServiceBase
      */ 
-    protected stateField: string = "";
+    public stateField: string = "";
 
     /**
      * 主状态属性集合
      * 
      * @memberof  WFGroupUIServiceBase
      */  
-    protected mainStateFields:Array<any> = [];
+    public mainStateFields:Array<any> = [];
 
     /**
      * 主状态集合Map
      * 
      * @memberof  WFGroupUIServiceBase
      */  
-    protected allDeMainStateMap:Map<string,string> = new Map();
+    public allDeMainStateMap:Map<string,string> = new Map();
 
     /**
      * Creates an instance of  WFGroupUIServiceBase.
@@ -134,7 +134,7 @@ export default class WFGroupUIServiceBase extends UIService {
      * 
      * @memberof  WFGroupUIServiceBase
 	 */
-	protected getRealDEType(entity:any){
+	public getRealDEType(entity:any){
 
     }
 
@@ -146,7 +146,7 @@ export default class WFGroupUIServiceBase extends UIService {
      * @param bWFMode   是否工作流模式
      * @memberof  WFGroupUIServiceBase
      */
-    protected async getDESDDEViewPDTParam(curData:any, bDataInWF:boolean, bWFMode:boolean){
+    public async getDESDDEViewPDTParam(curData:any, bDataInWF:boolean, bWFMode:boolean){
         let strPDTParam:string = '';
 		if (bDataInWF) {
 			// 判断数据是否在流程中
@@ -180,7 +180,7 @@ export default class WFGroupUIServiceBase extends UIService {
      * @param curData 当前数据
      * @memberof  WFGroupUIServiceBase
      */  
-    protected async getDEMainStateTag(curData:any){
+    public async getDEMainStateTag(curData:any){
         if(this.mainStateFields.length === 0) return null;
 
         this.mainStateFields.forEach((singleMainField:any) =>{

app_web/src/uiservice/wfmember/wfmember-ui-service-base.ts

@@ -17,49 +17,49 @@ export default class WFMemberUIServiceBase extends UIService {
      * 
      * @memberof  WFMemberUIServiceBase
      */
-    protected isEnableWorkflow:boolean = false;
+    public isEnableWorkflow:boolean = false;
 
     /**
      * 当前UI服务对应的数据服务对象
      * 
      * @memberof  WFMemberUIServiceBase
      */
-    protected dataService:WFMemberService = new WFMemberService();
+    public dataService:WFMemberService = new WFMemberService();
 
     /**
      * 所有关联视图
      * 
      * @memberof  WFMemberUIServiceBase
      */ 
-    protected allViewMap: Map<string, Object> = new Map();
+    public allViewMap: Map<string, Object> = new Map();
 
     /**
      * 状态值
      * 
      * @memberof  WFMemberUIServiceBase
      */ 
-    protected stateValue: number = 0;
+    public stateValue: number = 0;
 
     /**
      * 状态属性
      * 
      * @memberof  WFMemberUIServiceBase
      */ 
-    protected stateField: string = "";
+    public stateField: string = "";
 
     /**
      * 主状态属性集合
      * 
      * @memberof  WFMemberUIServiceBase
      */  
-    protected mainStateFields:Array<any> = [];
+    public mainStateFields:Array<any> = [];
 
     /**
      * 主状态集合Map
      * 
      * @memberof  WFMemberUIServiceBase
      */  
-    protected allDeMainStateMap:Map<string,string> = new Map();
+    public allDeMainStateMap:Map<string,string> = new Map();
 
     /**
      * Creates an instance of  WFMemberUIServiceBase.
@@ -131,7 +131,7 @@ export default class WFMemberUIServiceBase extends UIService {
      * 
      * @memberof  WFMemberUIServiceBase
 	 */
-	protected getRealDEType(entity:any){
+	public getRealDEType(entity:any){
 
     }
 
@@ -143,7 +143,7 @@ export default class WFMemberUIServiceBase extends UIService {
      * @param bWFMode   是否工作流模式
      * @memberof  WFMemberUIServiceBase
      */
-    protected async getDESDDEViewPDTParam(curData:any, bDataInWF:boolean, bWFMode:boolean){
+    public async getDESDDEViewPDTParam(curData:any, bDataInWF:boolean, bWFMode:boolean){
         let strPDTParam:string = '';
 		if (bDataInWF) {
 			// 判断数据是否在流程中
@@ -177,7 +177,7 @@ export default class WFMemberUIServiceBase extends UIService {
      * @param curData 当前数据
      * @memberof  WFMemberUIServiceBase
      */  
-    protected async getDEMainStateTag(curData:any){
+    public async getDEMainStateTag(curData:any){
         if(this.mainStateFields.length === 0) return null;
 
         this.mainStateFields.forEach((singleMainField:any) =>{

app_web/src/widgets/wfgroup/main-grid/main-grid-service.ts

@@ -45,12 +45,12 @@ export default class MainService extends ControlService {
     /**
      * 处理数据
      *
-     * @private
+     * @public
      * @param {Promise<any>} promise
      * @returns {Promise<any>}
      * @memberof MainService
      */
-    private doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
+    public doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
         return new Promise((resolve, reject) => {
             promise.then((response: any) => {
                 if (response && response.status === 200) {

app_web/src/widgets/wfgroup/main-grid/main-grid.less

@@ -53,7 +53,7 @@
         }
     }
     .el-table__body-wrapper{
-      height: calc(100% - 43px) !important;
+      height: calc(100% - 45px) !important;
     }
     .el-table__empty-block{
       height: auto !important;

app_web/src/widgets/wfmember/main-grid/main-grid-service.ts

@@ -45,12 +45,12 @@ export default class MainService extends ControlService {
     /**
      * 处理数据
      *
-     * @private
+     * @public
      * @param {Promise<any>} promise
      * @returns {Promise<any>}
      * @memberof MainService
      */
-    private doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
+    public doItems(promise: Promise<any>, deKeyField: string, deName: string): Promise<any> {
         return new Promise((resolve, reject) => {
             promise.then((response: any) => {
                 if (response && response.status === 200) {

app_web/src/widgets/wfmember/main-grid/main-grid.less

@@ -53,7 +53,7 @@
         }
     }
     .el-table__body-wrapper{
-      height: calc(100% - 43px) !important;
+      height: calc(100% - 45px) !important;
     }
     .el-table__empty-block{
       height: auto !important;

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

 server:
-  port: 40003
+  port: 8081