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/locale/lanres/ibzdepartment/ibzdepartment_en_US.ts

@@ -144,29 +144,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 };
\ No newline at end of file

app_web/src/locale/lanres/ibzdepartment/ibzdepartment_zh_CN.ts

@@ -143,29 +143,9 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem16: {
-			caption: '其它',
-			tip: '其它',
-		},
-		tbitem21: {
-			caption: '导出数据模型',
-			tip: '导出数据模型',
-		},
-		tbitem23: {
-			caption: '数据导入',
-			tip: '数据导入',
-		},
-		tbitem17: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem19: {
 			caption: '过滤',
 			tip: '过滤',
 		},
-		tbitem18: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 };
\ No newline at end of file

app_web/src/locale/lanres/ibzemployee/ibzemployee_en_US.ts

@@ -204,30 +204,10 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 	changepwdviewtoolbar_toolbar: {
 		tbitem1: {

app_web/src/locale/lanres/ibzemployee/ibzemployee_zh_CN.ts

@@ -203,30 +203,10 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem16: {
-			caption: '其它',
-			tip: '其它',
-		},
-		tbitem21: {
-			caption: '导出数据模型',
-			tip: '导出数据模型',
-		},
-		tbitem23: {
-			caption: '数据导入',
-			tip: '数据导入',
-		},
-		tbitem17: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem19: {
 			caption: '过滤',
 			tip: '过滤',
 		},
-		tbitem18: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 	changepwdviewtoolbar_toolbar: {
 		tbitem1: {

app_web/src/locale/lanres/ibzorganization/ibzorganization_en_US.ts

@@ -75,9 +75,6 @@ export default {
 			orgcode: "单位代码", 
 			orgname: "名称", 
 			porgname: "上级单位", 
-			orglevel: "单位级别", 
-			shortname: "单位简称", 
-			showorder: "排序", 
 			orgid: "单位标识", 
 			porgid: "上级单位", 
 		},
@@ -165,29 +162,9 @@ export default {
 			caption: "-",
 			tip: "",
 		},
-		tbitem16: {
-			caption: "其它",
-			tip: "其它",
-		},
-		tbitem21: {
-			caption: "Export Data Model",
-			tip: "导出数据模型",
-		},
-		tbitem23: {
-			caption: "数据导入",
-			tip: "数据导入",
-		},
-		tbitem17: {
-			caption: "-",
-			tip: "",
-		},
 		tbitem19: {
 			caption: "Filter",
 			tip: "Filter",
 		},
-		tbitem18: {
-			caption: "Help",
-			tip: "Help",
-		},
 	},
 };
\ No newline at end of file

app_web/src/locale/lanres/ibzorganization/ibzorganization_zh_CN.ts

@@ -74,9 +74,6 @@ export default {
 			orgcode: '单位代码', 
 			orgname: '名称', 
 			porgname: '上级单位', 
-			orglevel: '单位级别', 
-			shortname: '单位简称', 
-			showorder: '排序', 
 			orgid: '单位标识', 
 			porgid: '上级单位', 
 		},
@@ -164,29 +161,9 @@ export default {
 			caption: '-',
 			tip: '',
 		},
-		tbitem16: {
-			caption: '其它',
-			tip: '其它',
-		},
-		tbitem21: {
-			caption: '导出数据模型',
-			tip: '导出数据模型',
-		},
-		tbitem23: {
-			caption: '数据导入',
-			tip: '数据导入',
-		},
-		tbitem17: {
-			caption: '-',
-			tip: '',
-		},
 		tbitem19: {
 			caption: '过滤',
 			tip: '过滤',
 		},
-		tbitem18: {
-			caption: '帮助',
-			tip: '帮助',
-		},
 	},
 };
\ No newline at end of file

app_web/src/pages/ou/ibzdepartment-grid-view/ibzdepartment-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/ou/ibzemployee-grid-view/ibzemployee-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/ou/ibzorganization-grid-view/ibzorganization-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/ibzdepartment/ibzdepartment-ui-service-base.ts

@@ -17,49 +17,49 @@ export default class IBZDepartmentUIServiceBase extends UIService {
      * 
      * @memberof  IBZDepartmentUIServiceBase
      */
-    protected isEnableWorkflow:boolean = false;
+    public isEnableWorkflow:boolean = false;
 
     /**
      * 当前UI服务对应的数据服务对象
      * 
      * @memberof  IBZDepartmentUIServiceBase
      */
-    protected dataService:IBZDepartmentService = new IBZDepartmentService();
+    public dataService:IBZDepartmentService = new IBZDepartmentService();
 
     /**
      * 所有关联视图
      * 
      * @memberof  IBZDepartmentUIServiceBase
      */ 
-    protected allViewMap: Map<string, Object> = new Map();
+    public allViewMap: Map<string, Object> = new Map();
 
     /**
      * 状态值
      * 
      * @memberof  IBZDepartmentUIServiceBase
      */ 
-    protected stateValue: number = 0;
+    public stateValue: number = 0;
 
     /**
      * 状态属性
      * 
      * @memberof  IBZDepartmentUIServiceBase
      */ 
-    protected stateField: string = "";
+    public stateField: string = "";
 
     /**
      * 主状态属性集合
      * 
      * @memberof  IBZDepartmentUIServiceBase
      */  
-    protected mainStateFields:Array<any> = [];
+    public mainStateFields:Array<any> = [];
 
     /**
      * 主状态集合Map
      * 
      * @memberof  IBZDepartmentUIServiceBase
      */  
-    protected allDeMainStateMap:Map<string,string> = new Map();
+    public allDeMainStateMap:Map<string,string> = new Map();
 
     /**
      * Creates an instance of  IBZDepartmentUIServiceBase.
@@ -133,7 +133,7 @@ export default class IBZDepartmentUIServiceBase extends UIService {
      * 
      * @memberof  IBZDepartmentUIServiceBase
 	 */
-	protected getRealDEType(entity:any){
+	public getRealDEType(entity:any){
 
     }
 
@@ -145,7 +145,7 @@ export default class IBZDepartmentUIServiceBase extends UIService {
      * @param bWFMode   是否工作流模式
      * @memberof  IBZDepartmentUIServiceBase
      */
-    protected async getDESDDEViewPDTParam(curData:any, bDataInWF:boolean, bWFMode:boolean){
+    public async getDESDDEViewPDTParam(curData:any, bDataInWF:boolean, bWFMode:boolean){
         let strPDTParam:string = '';
 		if (bDataInWF) {
 			// 判断数据是否在流程中
@@ -179,7 +179,7 @@ export default class IBZDepartmentUIServiceBase extends UIService {
      * @param curData 当前数据
      * @memberof  IBZDepartmentUIServiceBase
      */  
-    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/ibzemployee/ibzemployee-ui-service-base.ts

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

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

 server:
-  port: 40001
+  port: 8080