Skip to content

I
ibzou
提交 f437c28f 编写于 作者: sq3536's avatar sq3536
浏览文件
操作

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	ibzou-core/src/main/java/cn/ibizlab/core/ou/extensions/aspect/IBZEmp2UserAspect.java
上级 098b421c 255b3547
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 15262 行增加 和 1119 行删除
app_web/CHANGELOG.md
浏览文件 @ f437c28f
## v7.0.0-alpha.6 [2020-5-23]
### Bug修复
修复处理快速分组模型动态数据部分
修复列表，数据视图默认排序
### 功能新增及优化
#### 模板
补充单位选择器、部门选择器、人员选择器
#### 基础文件
补充单位选择器、部门选择器、人员选择器
## v7.0.0-alpha.5 [2020-5-21]
### Bug修复
修复表格视图搜索placeholder显示为搜索字段
修复表单嵌表单分页异常
修复门户视图操作栏标题
修复看板部件高度自动撑
修复表单分组，界面行为组不显示
修复表格操作列数据异常
### 功能新增及优化
#### 模板
支持拷贝功能
支持实体甘特图视图
支持面板项隐藏表单项
支持表格列最小宽度和操作列样式支持
支持列表项、面板代码表转化
#### 基础文件
支持列表项、面板代码表转化
修复表单分组，界面行为组不显示
## v7.0.0-alpha.4 [2020-5-14]
### Bug修复
......
app_web/package.json
浏览文件 @ f437c28f
......@@ -24,7 +24,8 @@
"element-ui": "^2.13.0",
"file-saver": "^2.0.2",
"font-awesome": "^4.7.0",
"ibiz-gantt-elastic": "^1.0.8",
"ibiz-gantt-elastic": "^1.0.12",
"ibiz-vue-lib": "^0.1.6",
"interactjs": "^1.9.4",
"moment": "^2.24.0",
"path-to-regexp": "^6.1.0",
......
app_web/public/assets/json/view-config.json
浏览文件 @ f437c28f
{
"ibzemployeeeditgridview": {
"title": "人员表格视图",
"caption": "人员",
"viewtype": "DEGRIDVIEW",
"viewmodule": "ou",
"viewname": "IBZEmployeeEditGridView",
"viewtag": "0c24f382fdfded375e4ef737707fdd80"
},
"ibzorganizationeditview": {
"title": "单位机构编辑视图",
"caption": "单位机构",
......@@ -39,6 +47,22 @@
"viewname": "IBZEmployeeGridView",
"viewtag": "2300119cfeaff98d4bc48c1679515968"
},
"ibzdepartmenteditgridview": {
"title": "部门表格视图",
"caption": "部门",
"viewtype": "DEGRIDVIEW",
"viewmodule": "ou",
"viewname": "IBZDepartmentEditGridView",
"viewtag": "230a2347ac7bca8734046b14777bc258"
},
"ibzorganizationtreeexpview": {
"title": "单位机构树导航视图",
"caption": "单位机构",
"viewtype": "DETREEEXPVIEW",
"viewmodule": "ou",
"viewname": "IBZOrganizationTreeExpView",
"viewtag": "25e23f456601163e730de6c1a825364b"
},
"ibzorganizationpickupgridview": {
"title": "单位机构选择表格视图",
"caption": "单位机构",
......@@ -143,6 +167,14 @@
"viewname": "IBZDeptMemberGridView",
"viewtag": "c9aa00ee38b42ea5ba1d2deb5959ac2b"
},
"ibzdepartmenttreeexpview": {
"title": "部门树导航视图",
"caption": "部门",
"viewtype": "DETREEEXPVIEW",
"viewmodule": "ou",
"viewname": "IBZDepartmentTreeExpView",
"viewtag": "cace6f75674cff323d90d670e609aa21"
},
"ibzemployeepickupview": {
"title": "人员数据选择视图",
"caption": "人员",
......
app_web/src/app-register.ts
浏览文件 @ f437c28f
......@@ -71,6 +71,12 @@ import AppUploadFileInfo from './components/app-upload-file-info/app-upload-file
import ContextMenu from './components/context-menu/context-menu'
import AppColumnFormat from './components/app-column-format/app-column-format.vue'
import AppQuickGroup from './components/app-quick-group/app-quick-group.vue'
import AppOrgSelect from './components/app-org-select/app-org-select.vue'
import AppDepartmentSelect from './components/app-department-select/app-department-select.vue'
import IBizGroupSelect from './components/ibiz-group-select/ibiz-group-select.vue'
import IBizGroupPicker from './components/ibiz-group-picker/ibiz-group-picker.vue'
// 全局挂载UI实体服务注册中心
window['uiServiceRegister'] = uiServiceRegister;
......@@ -151,5 +157,9 @@ export const AppComponents = {
v.component('context-menu',ContextMenu);
v.component('app-column-format',AppColumnFormat);
v.component('app-quick-group',AppQuickGroup);
v.component('app-org-select',AppOrgSelect);
v.component('app-department-select',AppDepartmentSelect);
v.component('ibiz-group-select',IBizGroupSelect);
v.component('ibiz-group-picker',IBizGroupPicker);
},
};
\ No newline at end of file
app_web/src/components/app-department-select/app-department-select.less 0 → 100644
浏览文件 @ f437c28f
.ivu-dropdown{
.ivu-dropdown-rel{
.tree-input{
.ivu-input-suffix{
width: auto;
text-align: right;
.icon-arrow{
margin-right: 4px;
}
}
.el-icon-circle-close{
display: none;
}
}
.tree-input:hover{
.el-icon-circle-close{
display: inline-block;
}
}
}
.ivu-select-dropdown{
max-height: 200px;
overflow: scroll;
.tree-contant{
overflow:inherit;
}
}
}
app_web/src/components/app-department-select/app-department-select.vue 0 → 100644
浏览文件 @ f437c28f
<template>
<div class="app-department-select">
<ibiz-select-tree :NodesData="Nodesdata" v-model="selectTreeValue" :multiple="multiple" @select="onSelect"></ibiz-select-tree>
</div>
</template>
<script lang="ts">
import { Vue, Component, Watch, Prop, Model } from 'vue-property-decorator';
@Component({
})
export default class AppDepartmentSelect extends Vue {
/**
* 接口url
*
* @type {*}
* @memberof AppDepartmentSelect
*/
@Prop({default:'/ibzorganizations/{orgid}/ibzdepartments/picker'}) public url?: any;
/**
* 过滤项
*
* @type {*}
* @memberof AppDepartmentSelect
*/
@Prop() public filter?: any;
/**
* 过滤项
*
* @type {*}
* @memberof AppDepartmentSelect
*/
@Prop() public fillMap?: any;
/**
* 是否多选
*
* @type {*}
* @memberof AppDepartmentSelect
*/
@Prop({default:false}) public multiple?: any;
/**
* 表单数据
*
* @type {*}
* @memberof AppDepartmentSelect
*/
@Prop() public data!: any;
/**
* 上下文变量
*
* @type {*}
* @memberof AppDepartmentSelect
*/
@Prop() public context!: any;
/**
* 选中数值
*
* @type {*}
* @memberof AppDepartmentSelect
*/
public selectTreeValue:any = "";
/**
* 树节点数据
*
* @type {*}
* @memberof AppDepartmentSelect
*/
public Nodesdata: any[] = [];
/**
* 当前树节点数据的url
*
* @type {*}
* @memberof AppDepartmentSelect
*/
public oldurl: any[] = [];
/**
* 获取节点数据
*
* @memberof AppDepartmentSelect
*/
public handleFilter(){
if(this.filter){
if(this.data && this.data[this.filter]){
return this.data[this.filter];
}else if(this.context && this.context[this.filter]){
return this.context[this.filter];
}
}else{
return this.context.srforgid;
}
}
/**
* 获取节点数据
*
* @memberof AppDepartmentSelect
*/
public searchNodesData(){
// 处理过滤参数，生成url
let param = this.handleFilter();
let _url = this.url.replace(/{orgid}/,param)
if(this.oldurl === _url){
return;
}
this.oldurl = _url;
// 缓存机制
const result:any = this.$store.getters.getCopyData(_url);
if(result){
this.Nodesdata = result;
return;
}
this.$http.get(_url).then((response: any) => {
this.Nodesdata = response.data;
this.$store.commit('addDepData', { srfkey: this.filter, orgData: response.data });
}).catch((response: any) => {
if (!response || !response.status || !response.data) {
this.$Notice.error({ title: '错误', desc: '系统异常！' });
return;
}
});
}
/**
* 值变化
*
* @param {*} newVal
* @param {*} oldVal
* @memberof AppDepartmentSelect
*/
@Watch('data',{immediate:true,deep:true})
public onValueChange(newVal: any, oldVal: any) {
if(newVal){
this.computedSelectedData();
this.$nextTick(()=>{
this.searchNodesData();
});
}
}
/**
* 计算选中值
*
* @memberof AppOrgSelect
*/
public computedSelectedData(){
// 单选
if(!this.multiple){
if(this.fillMap && Object.keys(this.fillMap).length >0){
let templateValue = {};
Object.keys(this.fillMap).forEach((item:any) =>{
if(this.data && this.data[this.fillMap[item]]){
Object.assign(templateValue,{[item]:this.data[this.fillMap[item]]});
}
})
this.selectTreeValue = JSON.stringify([templateValue]);
}
}else{
// 多选
if(this.fillMap && Object.keys(this.fillMap).length >0){
let tempArray:Array<any> = [];
Object.keys(this.fillMap).forEach((item:any) =>{
if(this.data && this.data[this.fillMap[item]]){
let tempDataArray:Array<any> = (this.data[this.fillMap[item]]).split(",");
tempDataArray.forEach((tempData:any,index:number) =>{
if(tempArray.length < tempDataArray.length){
let singleData:any ={[item]:tempData};
tempArray.push(singleData);
}else{
Object.assign(tempArray[index],{[item]:tempData});
}
})
}
})
this.selectTreeValue = JSON.stringify(tempArray);
}
}
}
/**
* select事件处理
*
* @param {*} $event
* @memberof AppDepartmentSelect
*/
public onSelect($event:any){
// 组件自身抛值事件
let selectArr = JSON.parse($event);
// fillMap抛值事件
if(this.fillMap && Object.keys(this.fillMap).length > 0){
Object.keys(this.fillMap).forEach((attribute:string) => {
let _name = this.fillMap[attribute];
let _value = selectArr.map((item:any) => item[attribute]);
this.$emit('select-change',{name: this.fillMap[attribute], value: _value.join(",")})
});
}
}
}
</script>
<style lang='less'>
@import './app-department-select.less';
</style>
\ No newline at end of file
app_web/src/components/app-org-select/app-org-select.less 0 → 100644
浏览文件 @ f437c28f
.app-org-select {
width: 100%;
}
\ No newline at end of file
app_web/src/components/app-org-select/app-org-select.vue 0 → 100644
浏览文件 @ f437c28f
<template>
<div class="app-org-select">
<ibiz-select-tree :NodesData="NodesData" v-model="selectTreeValue" :multiple="multiple" @select="treeSelectChange"></ibiz-select-tree>
</div>
</template>
<script lang = 'ts'>
import { Vue, Component, Prop, Watch } from "vue-property-decorator";
import { Http } from '@/utils';
@Component({})
export default class AppOrgSelect extends Vue {
/**
* 表单数据
*
* @memberof AppOrgSelect
*/
@Prop() public data!:any;
/**
* 上下文
*
* @memberof AppOrgSelect
*/
@Prop() public context!:any;
/**
* 填充对象
*
* @memberof AppOrgSelect
*/
@Prop() public fillMap:any;
/**
* 过滤项
*
* @memberof AppOrgSelect
*/
@Prop() public filter?:string;
/**
* 是否多选
*
* @memberof AppOrgSelect
*/
@Prop({default:false}) public multiple?:boolean;
/**
* 监听表单数据变化
*
* @memberof AppOrgSelect
*/
@Watch('data',{immediate:true,deep:true})
onDataChange(newVal: any, oldVal: any) {
if(newVal){
this.computedSelectedData();
if(this.filter){
let tempFilterValue:any = this.initBasicData();
// filter值变化才去请求数据
if(tempFilterValue && (this.copyFilterValue !== tempFilterValue)){
this.loadTreeData(this.orgDataUrl.replace('${orgid}',tempFilterValue));
this.copyFilterValue = tempFilterValue;
}
}
}
}
/**
* 查询单位路径
*
* @memberof AppOrgSelect
*/
public orgDataUrl:string ="/ibzorganizations/${orgid}/suborg/picker";
/**
* 选择值
*
* @memberof AppOrgSelect
*/
public selectTreeValue:any = "";
/**
* 树节点数据
*
* @memberof AppOrgSelect
*/
public NodesData:any = [];
/**
* 备份过滤值
*
* @memberof AppOrgSelect
*/
public copyFilterValue:any;
/**
* vue生命周期
*
* @memberof AppOrgSelect
*/
public created(){
if(!this.filter){
this.loadTreeData(this.orgDataUrl.replace('${orgid}','alls'));
}
}
/**
* 加载树数据
*
* @memberof AppOrgSelect
*/
public initBasicData(){
// 计算出过滤值
if(this.filter){
if(this.data && this.data[this.filter]){
return this.data[this.filter];
}else if(this.context && this.context[this.filter]){
return this.context[this.filter];
}else{
return null;
}
}
}
/**
* 计算选中值
*
* @memberof AppOrgSelect
*/
public computedSelectedData(){
// 单选
if(!this.multiple){
if(this.fillMap && Object.keys(this.fillMap).length >0){
let templateValue = {};
Object.keys(this.fillMap).forEach((item:any) =>{
if(this.data && this.data[this.fillMap[item]]){
Object.assign(templateValue,{[item]:this.data[this.fillMap[item]]});
}
})
this.selectTreeValue = JSON.stringify([templateValue]);
}
}else{
// 多选
if(this.fillMap && Object.keys(this.fillMap).length >0){
let tempArray:Array<any> = [];
Object.keys(this.fillMap).forEach((item:any) =>{
if(this.data && this.data[this.fillMap[item]]){
let tempDataArray:Array<any> = (this.data[this.fillMap[item]]).split(",");
tempDataArray.forEach((tempData:any,index:number) =>{
if(tempArray.length < tempDataArray.length){
let singleData:any ={[item]:tempData};
tempArray.push(singleData);
}else{
Object.assign(tempArray[index],{[item]:tempData});
}
})
}
})
this.selectTreeValue = JSON.stringify(tempArray);
}
}
}
/**
* 加载树数据
*
* @memberof AppOrgSelect
*/
public loadTreeData(requestUrl:string){
if(this.filter){
const result:any = this.$store.getters.getCopyData(this.filter);
if(result){
this.NodesData = result;
return;
}
}
Http.getInstance().get(requestUrl).then((res:any) =>{
if(!res.status && res.status !== 200){
console.error("加载数据失败");
return;
}
this.NodesData = res.data;
if(this.filter){
this.$store.commit('addOrgData', { srfkey: this.filter, orgData: res.data });
}
})
}
/**
* 树选择触发事件
*
* @memberof AppOrgSelect
*/
public treeSelectChange($event:any){
// 多选
if(this.multiple){
if(!Object.is($event,'[]')){
const tempValue:any = JSON.parse($event);
if(this.fillMap && Object.keys(this.fillMap).length >0){
Object.keys(this.fillMap).forEach((item:any) =>{
let tempResult:any ="";
tempValue.forEach((value:any,index:number) =>{
tempResult += index>0?`,${value[item]}`:`${value[item]}`;
})
this.emitValue(this.fillMap[item],tempResult);
})
}
}else{
if(this.fillMap && Object.keys(this.fillMap).length >0){
Object.keys(this.fillMap).forEach((item:any) =>{
this.emitValue(this.fillMap[item],null);
})
}
}
}else{
// 单选
if(!Object.is($event,'[]')){
const tempValue:any = JSON.parse($event)[0];
if(this.fillMap && Object.keys(this.fillMap).length >0){
Object.keys(this.fillMap).forEach((item:any) =>{
this.emitValue(this.fillMap[item],tempValue[item]);
})
}
}else{
if(this.fillMap && Object.keys(this.fillMap).length >0){
Object.keys(this.fillMap).forEach((item:any) =>{
this.emitValue(this.fillMap[item],null);
})
}
}
}
}
/**
* 抛值
*
* @memberof AppOrgSelect
*/
public emitValue(name:string,value:any){
this.$emit('select-change',{name:name,value:value});
}
}
</script>
<style lang="less">
@import "./app-org-select.less";
</style>
\ No newline at end of file
app_web/src/components/ibiz-group-picker/ibiz-group-picker.vue 0 → 100644
浏览文件 @ f437c28f
<template>
<div class="ibiz-group-picker">
<div class="ibiz-group-container">
<div v-if="showTree" class="ibiz-group-tree">
<ibiz-select-tree :NodesData="treeItems" v-model="treeSelectVal" :treeOnly="true" @select="treeSelect"></ibiz-select-tree>
</div>
<div class="ibiz-group-content">
<ibiz-group-card :data="cardItems" text="label" value="id" groupName="group" :multiple="multiple" :defaultSelect="cardSelctVal" @select="groupSelect"></ibiz-group-card>
</div>
</div>
<div class="ibiz-group-footer">
<el-button size="small" type="primary" @click="onOK">确认</el-button>
<el-button size="small" @click="onCancel">取消</el-button>
</div>
</div>
</template>
<script lang="ts">
import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
import { Subject } from 'rxjs';
import { Http } from '../../utils';
@Component({})
export default class IBizGroupPicker extends Vue {
/**
* 视图上下文参数
*
* @type {*}
* @memberof IBizGroupPicker
*/
@Prop() viewdata: any;
/**
* 视图参数
*
* @type {*}
* @memberof IBizGroupPicker
*/
@Prop() viewparam: any;
/**
* 多选
*
* @type {*}
* @memberof IBizGroupPicker
*/
protected multiple: boolean = false;
/**
* 树数据集
*
* @type {*}
* @memberof IBizGroupPicker
*/
protected treeItems: any[] = [];
/**
* 分组表数据集
*
* @type {*}
* @memberof IBizGroupPicker
*/
protected cardItems: any[] = [];
/**
* 视图上下文参数对象
*
* @type {*}
* @memberof IBizGroupPicker
*/
protected viewData: any;
/**
* 视图参数对象
*
* @type {*}
* @memberof IBizGroupPicker
*/
protected viewParam: any;
/**
* 树选中值
*
* @type {*}
* @memberof IBizGroupPicker
*/
protected treeSelectVal: string = '';
/**
* 分组表选中集合
*
* @type {*}
* @memberof IBizGroupPicker
*/
protected cardSelctVal: any = [];
/**
* 数据选中集合
*
* @type {*}
* @memberof IBizGroupPicker
*/
protected selects: any[] = [];
/**
* 是否显示树
*
* @type {*}
* @memberof IBizGroupPicker
*/
get showTree() {
if(this.viewParam.hasfilter && Object.is(this.viewData.srforgid, this.viewParam.filtervalue)) {
return false;
}
return true;
}
/**
* 生命周期
*
* @type {*}
* @memberof IBizGroupPicker
*/
public created() {
if(!this.viewdata || !this.viewparam) {
return;
}
this.viewData = JSON.parse(this.viewdata);
this.viewParam = JSON.parse(this.viewparam);
this.multiple = this.viewParam.multiple;
if (this.viewParam.selects) {
this.viewParam.selects.forEach((select: any) => {
this.selects.push(select);
this.cardSelctVal.push(select.id)
})
}
this.load();
}
/**
* 加载数据
*
* @type {*}
* @memberof IBizGroupPicker
*/
public load() {
if(this.showTree) {
this.loadTree();
} else {
this.loadGroupData(this.viewParam.filtervalue);
}
}
/**
* 加载树数据
*
* @type {*}
* @memberof IBizGroupPicker
*/
public loadTree() {
let orgid = this.viewParam.hasfilter ? this.viewParam.filtervalue : '450000';
let get = Http.getInstance().get(`/ibzorganizations/${orgid}/suborg/ibzdepartments/picker`, true);
get.then((response: any) => {
if(response.status === 200) {
this.treeItems = response.data;
}
}).catch((error: any) => {
console.log(error)
})
}
/**
* 加载分组表数据
*
* @type {*}
* @memberof IBizGroupPicker
*/
public loadGroupData(key: string) {
let get = Http.getInstance().get(`/ibzorganizations/${key}/ibzemployees/picker`, true);
get.then((response: any) => {
if(response.status === 200) {
this.cardItems = response.data;
}
}).catch((error: any) => {
console.log(error)
})
}
/**
* 树选中
*
* @type {*}
* @memberof IBizGroupPicker
*/
public treeSelect(event: any) {
if(!event || JSON.parse(event).length == 0) {
return;
}
const items: any = JSON.parse(event);
this.loadGroupData(items[0].id);
}
/**
* 分组表选中
*
* @type {*}
* @memberof IBizGroupPicker
*/
public groupSelect(event: any) {
if (!event || !event.select) {
return;
}
if(!this.multiple) {
this.selects = [];
}
if(event.rselect) {
let index: number = this.selects.findIndex((item: any) => Object.is(event.rselect, item.id));
if(index >= 0) {
this.selects.splice(index, 1);
}
} else {
event.select.forEach((key: string) => {
let index: number = this.selects.findIndex((item: any) => Object.is(key, item.id));
if(index >= 0) {
return;
}
let item: any = this.cardItems.find((item: any) => Object.is(key, item.id));
if (item) {
this.selects.push(item);
}
});
}
}
/**
* 确认
*
* @type {*}
* @memberof IBizGroupPicker
*/
public onOK() {
this.$emit('close', this.selects);
}
/**
* 取消
*
* @type {*}
* @memberof IBizGroupPicker
*/
public onCancel() {
this.$emit('close');
}
}
</script>
<style lang="less">
.ibiz-group-container {
display: flex;
height: calc(100% - 65px);
.ibiz-group-tree {
width: 400px;
border-right: 1px solid #ddd;
padding: 0 10px;
overflow: auto;
height: 100%;
}
.ibiz-group-content {
flex-grow: 1;
padding: 0 10px;
overflow: auto;
height: 100%;
}
}
.ibiz-group-footer {
padding: 16px;
text-align: right;
border-top: 1px solid #ddd;
}
</style>
\ No newline at end of file
app_web/src/components/ibiz-group-select/ibiz-group-select.vue 0 → 100644
浏览文件 @ f437c28f
<template>
<div class="ibiz-group-select">
<div class="ibiz-group-content">
<span v-if="!multiple">
{{ selectName }}
</span>
<template v-else v-for="(select, index) of selects">
<div :key="index" class="ibiz-group-item">
{{ select.label }}
<i v-if="!disabled" class="el-icon-close" @click="remove(select)"></i>
</div>
</template>
</div>
<div v-if="!disabled" class="ibiz-group-open">
<i v-if="!disabled && !multiple && selects.length > 0" class="el-icon-close" @click="remove(selects[0])"></i>
<i class="el-icon-search" @click="openView"></i>
</div>
</div>
</template>
<script lang="ts">
import { Component, Vue, Prop, Watch } from 'vue-property-decorator';
import { Subject } from 'rxjs';
@Component({})
export default class IBizGroupSelect extends Vue {
/**
* 名称标识
*
* @type {*}
* @memberof IBizGroupSelect
*/
@Prop() name!: string;
/**
* 数据接口地址
*
* @type {*}
* @memberof IBizGroupSelect
*/
@Prop() url?: string;
/**
* 多选
*
* @type {*}
* @memberof IBizGroupSelect
*/
@Prop({default: false}) multiple?: boolean;
/**
* 数据对象
*
* @type {*}
* @memberof IBizGroupSelect
*/
@Prop() data: any;
/**
* 过滤属性标识
*
* @type {*}
* @memberof IBizGroupSelect
*/
@Prop() filter?: string;
/**
* 是否启用
*
* @type {*}
* @memberof IBizGroupSelect
*/
@Prop() disabled?: boolean;
/**
* 值
*
* @type {*}
* @memberof IBizGroupSelect
*/
@Prop() value: any;
/**
* 上下文参数
*
* @type {*}
* @memberof IBizGroupSelect
*/
@Prop() context: any;
/**
* 关联属性
*
* @type {*}
* @memberof IBizGroupSelect
*/
@Prop() valueitem: any;
/**
* 填充属性
*
* @type {*}
* @memberof IBizGroupSelect
*/
@Prop() fillmap: any;
/**
* 选中项集合
*
* @type {*}
* @memberof IBizGroupSelect
*/
protected selects: any[] = [];
/**
* 值变化
*
* @type {*}
* @memberof IBizGroupSelect
*/
@Watch('value')
onValueChange(newVal: any) {
this.selects = [];
if (newVal) {
let item: any = {};
item.label = newVal.split(',');
if(this.valueitem) {
item.id = this.data[this.valueitem] ? this.data[this.valueitem].split(',') : [];
}
if(this.fillmap) {
for(let key in this.fillmap) {
item[this.fillmap[key]] = this.data[key] ? this.data[key].split(',') : [];
}
}
item.label.forEach((val: string, index: number) => {
let _item: any = {};
for(let key in item) {
_item[key] = item[key][index] ? item[key][index] : null;
}
this.selects.push(_item)
})
}
}
/**
* 单选时选中名称
*
* @type {*}
* @memberof IBizGroupSelect
*/
get selectName() {
if(this.selects.length > 0) {
return this.selects[0].label;
}
}
/**
* 打开选择视图
*
* @type {*}
* @memberof IBizGroupSelect
*/
public openView() {
const view: any = {
viewname: 'ibiz-group-picker',
title: '分组选择'
};
const context: any = JSON.parse(JSON.stringify(this.context));
const param: any = {};
Object.assign(param, {
hasfilter: this.filter ? true : false,
filtervalue: this.filter ? this.data[this.filter] : '',
multiple: this.multiple,
selects: this.selects
});
let container: Subject<any> = this.$appmodal.openModal(view, context, param);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
this.openViewClose(result);
});
}
/**
* 选择视图关闭
*
* @type {*}
* @memberof IBizGroupSelect
*/
public openViewClose(result: any) {
console.log(result)
this.selects = [];
if (result.datas && result.datas.length > 0) {
this.selects = result.datas
}
this.setValue()
}
/**
* 数据删除
*
* @type {*}
* @memberof IBizGroupSelect
*/
public remove(item: any) {
this.selects.splice(this.selects.indexOf(item), 1);
this.setValue()
}
/**
* 设置值
*
* @type {*}
* @memberof IBizGroupSelect
*/
public setValue() {
let item: any = {};
item[this.name] = null;
if(this.valueitem) {
item[this.valueitem] = null;
}
if(this.fillmap) {
for(let key in this.fillmap) {
item[key] = null;
}
}
if(this.multiple) {
this.selects.forEach((select: any) => {
item[this.name] = item[this.name] ? `${item[this.name]},${select.label}` : select.label;
if(this.valueitem) {
item[this.valueitem] = item[this.valueitem] ? `${item[this.valueitem]},${select.id}` : select.id;
}
if(this.fillmap) {
for(let key in this.fillmap) {
item[key] = item[key] ? `${item[key]},${select[this.fillmap[key]]}` : select[this.fillmap[key]];
}
}
});
} else {
item = this.selects.length > 0 ? this.selects[0] : {};
item[this.name] = this.selects.length > 0 ? this.selects[0].label : null;
if(this.valueitem) {
item[this.valueitem] = this.selects.length > 0 ? this.selects[0].id : null;
}
if(this.fillmap) {
for(let key in this.fillmap) {
item[key] = this.selects.length > 0 ? this.selects[0][this.fillmap[key]] : null;
}
}
}
for(let key in item) {
this.$emit('formitemvaluechange', { name: key, value: item[key] });
}
}
}
</script>
<style lang="less">
.ibiz-group-select {
width: 100%;
display: flex;
border: 1px solid #DCDFE6;
min-height: 32px;
border-radius: 4px;
.ibiz-group-content {
flex-grow: 1;
padding: 0 16px;
.ibiz-group-item {
display: inline-block;
border: 1px solid #bbb;
line-height: 24px;
border-radius: 5px;
margin-right: 5px;
padding: 0 5px;
}
}
.ibiz-group-open {
display: flex;
text-align: center;
align-items: center;
padding: 0 5px;
}
}
.ibiz-group-select:hover {
border-color: #108cee;
}
</style>
\ No newline at end of file
app_web/src/locale/lang/en-US.ts
浏览文件 @ f437c28f
......@@ -62,6 +62,8 @@ export default {
menuitem1: '单位管理',
menuitem2: '部门管理',
menuitem3: '人员管理',
menuitem4: '组织树',
menuitem5: '部门树',
},
},
},
......
app_web/src/locale/lang/zh-CN.ts
浏览文件 @ f437c28f
......@@ -62,6 +62,8 @@ export default {
menuitem1: '单位管理',
menuitem2: '部门管理',
menuitem3: '人员管理',
menuitem4: '组织树',
menuitem5: '部门树',
},
},
},
......
app_web/src/locale/lanres/ibzdepartment/ibzdepartment_en_US.ts
浏览文件 @ f437c28f
......@@ -25,6 +25,10 @@ export default {
},
editview: {
caption: "部门",
title: '部门',
},
editgridview: {
caption: "部门",
title: '部门',
},
pickupgridview: {
......@@ -37,6 +41,10 @@ export default {
},
pickupview: {
caption: "部门",
title: '部门',
},
treeexpview: {
caption: "部门",
title: '部门',
},
gridview: {
......@@ -113,6 +121,21 @@ export default {
uiactions: {
},
},
editgrid_grid: {
columns: {
deptid: "部门标识",
deptcode: "部门代码",
deptname: "部门名称",
shortname: "部门简称",
deptlevel: "部门级别",
bcode: "业务编码",
showorder: "排序",
createdate: "创建时间",
updatedate: "最后修改时间",
},
uiactions: {
},
},
default_searchform: {
details: {
formpage1: "常规条件",
......@@ -147,6 +170,32 @@ export default {
tip: "Copy {0}",
},
},
editgridviewtoolbar_toolbar: {
tbitem24: {
caption: "行编辑",
tip: "行编辑",
},
tbitem25: {
caption: "新建行",
tip: "新建行",
},
tbitem26: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
gridviewtoolbar_toolbar: {
tbitem1_opennewcreateview: {
caption: "新建",
......@@ -189,4 +238,11 @@ export default {
tip: "Filter",
},
},
depttree_treeview: {
nodes: {
root: '默认根节点',
},
uiactions: {
},
},
};
\ No newline at end of file
app_web/src/locale/lanres/ibzdepartment/ibzdepartment_zh_CN.ts
浏览文件 @ f437c28f
......@@ -24,6 +24,10 @@ export default {
},
editview: {
caption: '部门',
title: '部门',
},
editgridview: {
caption: '部门',
title: '部门',
},
pickupgridview: {
......@@ -36,6 +40,10 @@ export default {
},
pickupview: {
caption: '部门',
title: '部门',
},
treeexpview: {
caption: '部门',
title: '部门',
},
gridview: {
......@@ -112,6 +120,21 @@ export default {
uiactions: {
},
},
editgrid_grid: {
columns: {
deptid: '部门标识',
deptcode: '部门代码',
deptname: '部门名称',
shortname: '部门简称',
deptlevel: '部门级别',
bcode: '业务编码',
showorder: '排序',
createdate: '创建时间',
updatedate: '最后修改时间',
},
uiactions: {
},
},
default_searchform: {
details: {
formpage1: '常规条件',
......@@ -146,6 +169,32 @@ export default {
tip: '拷贝',
},
},
editgridviewtoolbar_toolbar: {
tbitem24: {
caption: '行编辑',
tip: '行编辑',
},
tbitem25: {
caption: '新建行',
tip: '新建行',
},
tbitem26: {
caption: '-',
tip: '',
},
tbitem8: {
caption: '删除',
tip: '删除',
},
tbitem9: {
caption: '-',
tip: '',
},
tbitem19: {
caption: '过滤',
tip: '过滤',
},
},
gridviewtoolbar_toolbar: {
tbitem1_opennewcreateview: {
caption: '新建',
......@@ -188,4 +237,11 @@ export default {
tip: '过滤',
},
},
depttree_treeview: {
nodes: {
root: '默认根节点',
},
uiactions: {
},
},
};
\ No newline at end of file
app_web/src/locale/lanres/ibzdept-member/ibzdept-member_en_US.ts
浏览文件 @ f437c28f
......@@ -41,6 +41,7 @@ export default {
columns: {
deptname: "部门",
personname: "成员",
deptid: "部门标识",
},
uiactions: {
},
......
app_web/src/locale/lanres/ibzdept-member/ibzdept-member_zh_CN.ts
浏览文件 @ f437c28f
......@@ -40,6 +40,7 @@ export default {
columns: {
deptname: '部门',
personname: '成员',
deptid: '部门标识',
},
uiactions: {
},
......
app_web/src/locale/lanres/ibzemployee/ibzemployee_en_US.ts
浏览文件 @ f437c28f
......@@ -39,6 +39,10 @@ export default {
updatedate: '最后修改时间',
},
views: {
editgridview: {
caption: "人员",
title: '人员',
},
editview: {
caption: "人员",
title: '人员',
......@@ -156,6 +160,23 @@ export default {
uiactions: {
},
},
editgrid_grid: {
columns: {
usercode: "用户工号",
personname: "姓名",
loginname: "登录名",
orgcode: "单位代码",
orgname: "单位名称",
mdeptcode: "主部门代码",
mdeptname: "主部门名称",
sex: "性别",
phone: "联系方式",
ipaddr: "ip地址",
showorder: "排序",
},
uiactions: {
},
},
main_grid: {
columns: {
usercode: "用户工号",
......@@ -183,6 +204,32 @@ export default {
uiactions: {
},
},
editgridviewtoolbar_toolbar: {
tbitem24: {
caption: "行编辑",
tip: "行编辑",
},
tbitem25: {
caption: "新建行",
tip: "新建行",
},
tbitem26: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: "Save",
......
app_web/src/locale/lanres/ibzemployee/ibzemployee_zh_CN.ts
浏览文件 @ f437c28f
......@@ -38,6 +38,10 @@ export default {
updatedate: '最后修改时间',
},
views: {
editgridview: {
caption: '人员',
title: '人员',
},
editview: {
caption: '人员',
title: '人员',
......@@ -155,6 +159,23 @@ export default {
uiactions: {
},
},
editgrid_grid: {
columns: {
usercode: '用户工号',
personname: '姓名',
loginname: '登录名',
orgcode: '单位代码',
orgname: '单位名称',
mdeptcode: '主部门代码',
mdeptname: '主部门名称',
sex: '性别',
phone: '联系方式',
ipaddr: 'ip地址',
showorder: '排序',
},
uiactions: {
},
},
main_grid: {
columns: {
usercode: '用户工号',
......@@ -182,6 +203,32 @@ export default {
uiactions: {
},
},
editgridviewtoolbar_toolbar: {
tbitem24: {
caption: '行编辑',
tip: '行编辑',
},
tbitem25: {
caption: '新建行',
tip: '新建行',
},
tbitem26: {
caption: '-',
tip: '',
},
tbitem8: {
caption: '删除',
tip: '删除',
},
tbitem9: {
caption: '-',
tip: '',
},
tbitem19: {
caption: '过滤',
tip: '过滤',
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: '保存',
......
app_web/src/locale/lanres/ibzorganization/ibzorganization_en_US.ts
浏览文件 @ f437c28f
......@@ -16,6 +16,10 @@ export default {
views: {
editview: {
caption: "单位机构",
title: '单位机构',
},
treeexpview: {
caption: "单位机构",
title: '单位机构',
},
pickupgridview: {
......@@ -172,4 +176,11 @@ export default {
tip: "Filter",
},
},
orgtree_treeview: {
nodes: {
root: '默认根节点',
},
uiactions: {
},
},
};
\ No newline at end of file
app_web/src/locale/lanres/ibzorganization/ibzorganization_zh_CN.ts
浏览文件 @ f437c28f
......@@ -15,6 +15,10 @@ export default {
views: {
editview: {
caption: '单位机构',
title: '单位机构',
},
treeexpview: {
caption: '单位机构',
title: '单位机构',
},
pickupgridview: {
......@@ -171,4 +175,11 @@ export default {
tip: '过滤',
},
},
orgtree_treeview: {
nodes: {
root: '默认根节点',
},
uiactions: {
},
},
};
\ No newline at end of file
app_web/src/mock/app/ouindex-view-appmenu/ouindex-view-appmenu.ts
浏览文件 @ f437c28f
......@@ -63,6 +63,42 @@ mock.onGet('v7/ouindex-viewappmenu').reply((config: any) => {
textcls: '',
appfunctag: 'Auto1',
resourcetag: '',
},
{
id: 'B043B2E4-3E81-4205-B1F8-54935A127BB2',
name: 'menuitem4',
text: '组织树',
type: 'MENUITEM',
counterid: '',
tooltip: '组织树',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: '_3',
resourcetag: '',
},
{
id: 'F195C919-76BD-4D80-9AAF-4FA48B58A81D',
name: 'menuitem5',
text: '部门树',
type: 'MENUITEM',
counterid: '',
tooltip: '部门树',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: '_2',
resourcetag: '',
},
],
}];
......
app_web/src/mock/viewconfig/viewconfig.ts
浏览文件 @ f437c28f
......@@ -7,7 +7,15 @@ import Mock from 'mockjs'
mock.onGet('./assets/json/view-config.json').reply((config: any) => {
let status = MockAdapter.mockStatus(config);
return [status,{
"ibzorganizationeditview": {
"ibzemployeeeditgridview": {
"title": "人员表格视图",
"caption": "人员",
"viewtype": "DEGRIDVIEW",
"viewmodule": "ou",
"viewname": "IBZEmployeeEditGridView",
"viewtag": "0c24f382fdfded375e4ef737707fdd80"
},
"ibzorganizationeditview": {
"title": "单位机构编辑视图",
"caption": "单位机构",
"viewtype": "DEEDITVIEW",
......@@ -47,6 +55,22 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "IBZEmployeeGridView",
"viewtag": "2300119cfeaff98d4bc48c1679515968"
},
"ibzdepartmenteditgridview": {
"title": "部门表格视图",
"caption": "部门",
"viewtype": "DEGRIDVIEW",
"viewmodule": "ou",
"viewname": "IBZDepartmentEditGridView",
"viewtag": "230a2347ac7bca8734046b14777bc258"
},
"ibzorganizationtreeexpview": {
"title": "单位机构树导航视图",
"caption": "单位机构",
"viewtype": "DETREEEXPVIEW",
"viewmodule": "ou",
"viewname": "IBZOrganizationTreeExpView",
"viewtag": "25e23f456601163e730de6c1a825364b"
},
"ibzorganizationpickupgridview": {
"title": "单位机构选择表格视图",
"caption": "单位机构",
......@@ -151,6 +175,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "IBZDeptMemberGridView",
"viewtag": "c9aa00ee38b42ea5ba1d2deb5959ac2b"
},
"ibzdepartmenttreeexpview": {
"title": "部门树导航视图",
"caption": "部门",
"viewtype": "DETREEEXPVIEW",
"viewmodule": "ou",
"viewname": "IBZDepartmentTreeExpView",
"viewtag": "cace6f75674cff323d90d670e609aa21"
},
"ibzemployeepickupview": {
"title": "人员数据选择视图",
"caption": "人员",
......
app_web/src/pages/ou/ibzdepartment-edit-grid-view/ibzdepartment-edit-grid-view.less 0 → 100644
浏览文件 @ f437c28f
.ibzdepartment-edit-grid-view{
position: relative;
}
.toolbar-container {
button {
margin: 6px 0px 4px 4px;
.caption {
margin-left: 4px;
}
}
.seperator {
color: #dcdee2;
margin: 0 0px 0 4px;
}
}
// this is less
app_web/src/pages/ou/ibzdepartment-edit-grid-view/ibzdepartment-edit-grid-view.vue 0 → 100644
浏览文件 @ f437c28f
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import IBZDepartmentEditGridViewBase from './ibzdepartment-edit-grid-view-base.vue';
import view_grid from '@widgets/ibzdepartment/edit-grid-grid/edit-grid-grid.vue';
import view_searchform from '@widgets/ibzdepartment/default-searchform/default-searchform.vue';
@Component({
components: {
view_grid,
view_searchform,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class IBZDepartmentEditGridView extends IBZDepartmentEditGridViewBase {
}
</script>
\ No newline at end of file
app_web/src/pages/ou/ibzdepartment-edit-view/ibzdepartment-edit-view-base.vue
浏览文件 @ f437c28f
......@@ -487,19 +487,19 @@ export default class IBZDepartmentEditViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click($event, '', $event2);
this.toolbar_tbitem7_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem9')) {
this.toolbar_tbitem9_click($event, '', $event2);
this.toolbar_tbitem9_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem10')) {
this.toolbar_tbitem10_click($event, '', $event2);
this.toolbar_tbitem10_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click($event, '', $event2);
this.toolbar_tbitem14_click(null, '', $event2);
}
}
......@@ -563,6 +563,9 @@ export default class IBZDepartmentEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"IBZDepartment");
}
......@@ -589,6 +592,9 @@ export default class IBZDepartmentEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"IBZDepartment");
}
......@@ -615,6 +621,9 @@ export default class IBZDepartmentEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"IBZDepartment");
}
......@@ -641,6 +650,9 @@ export default class IBZDepartmentEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"IBZDepartment");
}
......@@ -667,6 +679,9 @@ export default class IBZDepartmentEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"IBZDepartment");
}
......
app_web/src/pages/ou/ibzdepartment-grid-view/ibzdepartment-grid-view-base.vue
浏览文件 @ f437c28f
......@@ -9,7 +9,7 @@
<div class='view-top-messages'>
</div>
<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;' placeholder="请输入部门名称" />
<i-input v-show="!isExpandSearchForm" v-model="query" search enter-button @on-search="onSearch($event)" class='quick-search-input' style='max-width: 400px;' placeholder="部门名称" />
<div class='pull-right'>
<div class='toolbar-container'>
<tooltip :transfer="true" :max-width="600">
......@@ -557,34 +557,34 @@ export default class IBZDepartmentGridViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem1_opennewcreateview')) {
this.toolbar_tbitem1_opennewcreateview_click($event, '', $event2);
this.toolbar_tbitem1_opennewcreateview_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem4')) {
this.toolbar_tbitem4_click($event, '', $event2);
this.toolbar_tbitem4_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem6')) {
this.toolbar_tbitem6_click($event, '', $event2);
this.toolbar_tbitem6_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem24')) {
this.toolbar_tbitem24_click($event, '', $event2);
this.toolbar_tbitem24_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem25')) {
this.toolbar_tbitem25_click($event, '', $event2);
this.toolbar_tbitem25_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem8')) {
this.toolbar_tbitem8_click($event, '', $event2);
this.toolbar_tbitem8_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem13')) {
this.toolbar_tbitem13_click($event, '', $event2);
this.toolbar_tbitem13_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem11')) {
this.toolbar_tbitem11_click($event, '', $event2);
this.toolbar_tbitem11_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem19')) {
this.toolbar_tbitem19_click($event, '', $event2);
this.toolbar_tbitem19_click(null, '', $event2);
}
}
......@@ -708,6 +708,9 @@ export default class IBZDepartmentGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
const curUIService:IBZDepartmentUIService = new IBZDepartmentUIService();
curUIService.IBZDepartment_OpenNewCreateView(datas,contextJO, paramJO, $event, xData,this,"IBZDepartment");
......@@ -735,6 +738,9 @@ export default class IBZDepartmentGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Edit(datas, contextJO,paramJO, $event, xData,this,"IBZDepartment");
}
......@@ -761,6 +767,9 @@ export default class IBZDepartmentGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.View(datas, contextJO,paramJO, $event, xData,this,"IBZDepartment");
}
......@@ -787,6 +796,9 @@ export default class IBZDepartmentGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"IBZDepartment");
}
......@@ -813,6 +825,9 @@ export default class IBZDepartmentGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ToggleRowEdit(datas, contextJO,paramJO, $event, xData,this,"IBZDepartment");
}
......@@ -839,6 +854,9 @@ export default class IBZDepartmentGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.NewRow(datas, contextJO,paramJO, $event, xData,this,"IBZDepartment");
}
......@@ -865,6 +883,9 @@ export default class IBZDepartmentGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Remove(datas, contextJO,paramJO, $event, xData,this,"IBZDepartment");
}
......@@ -891,6 +912,9 @@ export default class IBZDepartmentGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ExportExcel(datas, contextJO,paramJO, $event, xData,this,"IBZDepartment");
}
......@@ -917,6 +941,9 @@ export default class IBZDepartmentGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"IBZDepartment");
}
......@@ -943,6 +970,9 @@ export default class IBZDepartmentGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ToggleFilter(datas, contextJO,paramJO, $event, xData,this,"IBZDepartment");
}
......
app_web/src/pages/ou/ibzdepartment-tree-exp-view/ibzdepartment-tree-exp-view.less 0 → 100644
浏览文件 @ f437c28f
.view-card {
>.ivu-card-extra {
top: 5px;
right: 0px;
}
}
.ibzdepartment-tree-exp-view{
position: relative;
}
app_web/src/pages/ou/ibzdepartment-tree-exp-view/ibzdepartment-tree-exp-view.vue 0 → 100644
浏览文件 @ f437c28f
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import IBZDepartmentTreeExpViewBase from './ibzdepartment-tree-exp-view-base.vue';
import view_treeexpbar from '@widgets/ibzdepartment/tree-exp-viewtreeexpbar-treeexpbar/tree-exp-viewtreeexpbar-treeexpbar.vue';
@Component({
components: {
view_treeexpbar,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class IBZDepartmentTreeExpView extends IBZDepartmentTreeExpViewBase {
}
</script>
\ No newline at end of file
app_web/src/pages/ou/ibzdept-member-edit-view/ibzdept-member-edit-view-base.vue
浏览文件 @ f437c28f
......@@ -487,19 +487,19 @@ export default class IBZDeptMemberEditViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click($event, '', $event2);
this.toolbar_tbitem7_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem9')) {
this.toolbar_tbitem9_click($event, '', $event2);
this.toolbar_tbitem9_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem10')) {
this.toolbar_tbitem10_click($event, '', $event2);
this.toolbar_tbitem10_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click($event, '', $event2);
this.toolbar_tbitem14_click(null, '', $event2);
}
}
......@@ -563,6 +563,9 @@ export default class IBZDeptMemberEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
......@@ -589,6 +592,9 @@ export default class IBZDeptMemberEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
......@@ -615,6 +621,9 @@ export default class IBZDeptMemberEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
......@@ -641,6 +650,9 @@ export default class IBZDeptMemberEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
......@@ -667,6 +679,9 @@ export default class IBZDeptMemberEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
......
app_web/src/pages/ou/ibzdept-member-grid-view/ibzdept-member-grid-view-base.vue
浏览文件 @ f437c28f
......@@ -533,31 +533,31 @@ export default class IBZDeptMemberGridViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem4')) {
this.toolbar_tbitem4_click($event, '', $event2);
this.toolbar_tbitem4_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem5')) {
this.toolbar_tbitem5_click($event, '', $event2);
this.toolbar_tbitem5_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem6')) {
this.toolbar_tbitem6_click($event, '', $event2);
this.toolbar_tbitem6_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem24')) {
this.toolbar_tbitem24_click($event, '', $event2);
this.toolbar_tbitem24_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem25')) {
this.toolbar_tbitem25_click($event, '', $event2);
this.toolbar_tbitem25_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem8')) {
this.toolbar_tbitem8_click($event, '', $event2);
this.toolbar_tbitem8_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem13')) {
this.toolbar_tbitem13_click($event, '', $event2);
this.toolbar_tbitem13_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem11')) {
this.toolbar_tbitem11_click($event, '', $event2);
this.toolbar_tbitem11_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem19')) {
this.toolbar_tbitem19_click($event, '', $event2);
this.toolbar_tbitem19_click(null, '', $event2);
}
}
......@@ -645,6 +645,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Edit(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
......@@ -671,6 +674,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.View(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
......@@ -697,6 +703,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
......@@ -723,6 +732,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ToggleRowEdit(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
......@@ -749,6 +761,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.NewRow(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
......@@ -775,6 +790,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Remove(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
......@@ -801,6 +819,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ExportExcel(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
......@@ -827,6 +848,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Print(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
......@@ -853,6 +877,9 @@ export default class IBZDeptMemberGridViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ToggleFilter(datas, contextJO,paramJO, $event, xData,this,"IBZDeptMember");
}
......
app_web/src/pages/ou/ibzemployee-change-pwd-view/ibzemployee-change-pwd-view-base.vue
浏览文件 @ f437c28f
......@@ -467,7 +467,7 @@ export default class IBZEmployeeChangePwdViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem1')) {
this.toolbar_tbitem1_click($event, '', $event2);
this.toolbar_tbitem1_click(null, '', $event2);
}
}
......@@ -531,6 +531,9 @@ export default class IBZEmployeeChangePwdViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"IBZEmployee");
}
......
app_web/src/pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.less 0 → 100644
浏览文件 @ f437c28f
.ibzemployee-edit-grid-view{
position: relative;
}
.toolbar-container {
button {
margin: 6px 0px 4px 4px;
.caption {
margin-left: 4px;
}
}
.seperator {
color: #dcdee2;
margin: 0 0px 0 4px;
}
}
// this is less
app_web/src/pages/ou/ibzemployee-edit-grid-view/ibzemployee-edit-grid-view.vue 0 → 100644
浏览文件 @ f437c28f
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import IBZEmployeeEditGridViewBase from './ibzemployee-edit-grid-view-base.vue';
import view_grid from '@widgets/ibzemployee/edit-grid-grid/edit-grid-grid.vue';
import view_searchform from '@widgets/ibzemployee/default-searchform/default-searchform.vue';
@Component({
components: {
view_grid,
view_searchform,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class IBZEmployeeEditGridView extends IBZEmployeeEditGridViewBase {
}
</script>
\ No newline at end of file
app_web/src/pages/ou/ibzemployee-edit-view/ibzemployee-edit-view-base.vue
浏览文件 @ f437c28f
......@@ -487,19 +487,19 @@ export default class IBZEmployeeEditViewBase extends Vue {
*/
public toolbar_click($event: any, $event2?: any) {
if (Object.is($event.tag, 'tbitem3')) {
this.toolbar_tbitem3_click($event, '', $event2);
this.toolbar_tbitem3_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem7')) {
this.toolbar_tbitem7_click($event, '', $event2);
this.toolbar_tbitem7_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem9')) {
this.toolbar_tbitem9_click($event, '', $event2);
this.toolbar_tbitem9_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem10')) {
this.toolbar_tbitem10_click($event, '', $event2);
this.toolbar_tbitem10_click(null, '', $event2);
}
if (Object.is($event.tag, 'tbitem14')) {
this.toolbar_tbitem14_click($event, '', $event2);
this.toolbar_tbitem14_click(null, '', $event2);
}
}
......@@ -563,6 +563,9 @@ export default class IBZEmployeeEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Save(datas, contextJO,paramJO, $event, xData,this,"IBZEmployee");
}
......@@ -589,6 +592,9 @@ export default class IBZEmployeeEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.RemoveAndExit(datas, contextJO,paramJO, $event, xData,this,"IBZEmployee");
}
......@@ -615,6 +621,9 @@ export default class IBZEmployeeEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.SaveAndStart(datas, contextJO,paramJO, $event, xData,this,"IBZEmployee");
}
......@@ -641,6 +650,9 @@ export default class IBZEmployeeEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.ViewWFStep(datas, contextJO,paramJO, $event, xData,this,"IBZEmployee");
}
......@@ -667,6 +679,9 @@ export default class IBZEmployeeEditViewBase extends Vue {
if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()];
}
if(params){
datas = [params];
}
// 界面行为
this.Copy(datas, contextJO,paramJO, $event, xData,this,"IBZEmployee");
}
......
app_web/src/store/getters.ts
浏览文件 @ f437c28f
此差异已折叠。
app_web/src/store/mutations.ts
浏览文件 @ f437c28f
此差异已折叠。
app_web/src/store/state.ts
浏览文件 @ f437c28f
此差异已折叠。
app_web/yarn.lock
浏览文件 @ f437c28f
此差异已折叠。
ibzou-core/pom.xml
浏览文件 @ f437c28f
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或