Skip to content

I
ibzou
提交 354c2493 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

zhouweidong@lab.ibiz5.com 发布系统代码

上级 e939fa21
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 1138 行增加 和 1670 行删除
app_web/CHANGELOG.md
浏览文件 @ 354c2493
## v7.0.0-alpha.13 [2020-7-12]
### Bug修复
修复表格设置更新默认值不生效
修复行编辑中文本字段修改数据保存无法生效
修复行编辑时的错误提示
修复表格开关部件保存异常问题
修复表单可以修改数据主键问题
修复表格操作列问题
#### 基础文件
优化关系界面逻辑
## v7.0.0-alpha.12 [2020-7-2]
### Bug修复
......@@ -14,6 +34,14 @@
修复多行输入十行 高度问题
修复调整实体处理逻辑（参数name转化为codeName）
修复表单项更新值规则校验
修复单位部门选择器禁用功能
修复修复去掉某个子菜单后，主菜单不显示
### 功能新增及优化
#### 模板
......@@ -24,14 +52,28 @@
新增状态向导面板（658）
优化门户操作栏
新增门户操作栏图标（654）
新增首页空白模式支持
新增表格支持列拖动
优化应用级数据状态同步功能
新增主状态操作标识权限逻辑
新增工具栏、表格操作列、表单分组主状态操作标识判断
优化应用级数据状态同步功能（654）
优化应用国际化部分
#### 基础文件
新增修改密码功能（654）
优化无权限错误信息友好提示
优化应用国际化部分
## v7.0.0-alpha.11 [2020-6-21]
### Bug修复
......
app_web/package.json
浏览文件 @ 354c2493
......@@ -20,6 +20,7 @@
"@fullcalendar/vue": "^4.4.0",
"vuedraggable": "^2.23.2",
"async-validator": "^3.3.0",
"@popperjs/core": "^2.4.3",
"axios": "^0.19.1",
"core-js": "^3.4.4",
"echarts": "^4.6.0",
......
app_web/src/components/app-breadcrumb/app-breadcrumb.vue
浏览文件 @ 354c2493
......@@ -161,6 +161,7 @@ export default class Breadcrumb extends Vue {
if(item && item.meta && item.meta.viewType && Object.is(item.meta.viewType,"APPINDEX")){
let path: string | null = window.sessionStorage.getItem(Environment.AppName);
if (path) {
this.$store.commit("removeAllPage");
this.$router.push({ path: path });
} else {
this.$router.push("/");
......
app_web/src/components/app-form-druipart/app-form-druipart.vue
浏览文件 @ 354c2493
......@@ -271,6 +271,7 @@ export default class AppFormDRUIPart extends Vue {
//设置顶层视图唯一标识
Object.assign(tempContext,this.context);
Object.assign(tempContext,{srfparentdename:this.parentName,srfparentkey:_paramitem});
Object.assign(tempParam,{srfparentdename:this.parentName,srfparentkey:_paramitem});
// 设置局部上下文
if(this.localContext && Object.keys(this.localContext).length >0){
let _context:any = this.$util.computedNavData(formData,tempContext,this.viewparams,this.localContext);
......@@ -292,9 +293,9 @@ export default class AppFormDRUIPart extends Vue {
}
}
if(!this.isForbidLoad){
this.$nextTick(() => {
setTimeout(() => {
this.formDruipart.next({action:'load',data:{srfparentdename:this.parentName,srfparentkey:_paramitem}});
});
}, 0);
}
}
......
app_web/src/components/app-picker/app-picker.vue
浏览文件 @ 354c2493
......@@ -242,7 +242,7 @@ export default class AppPicker extends Vue {
* @param {*} oldVal
* @memberof AppPicker
*/
@Watch('value')
@Watch('value',{immediate:true})
public onValueChange(newVal: any, oldVal: any) {
this.curvalue = newVal;
if (Object.is(this.editortype, 'dropdown') && this.valueitem) {
......
app_web/src/components/app-span/app-span.vue
浏览文件 @ 354c2493
......@@ -6,7 +6,7 @@
<script lang="ts">
import { Vue, Component, Prop, Watch, Model } from 'vue-property-decorator';
import moment from "moment";
@Component({})
export default class AppSpan extends Vue {
......@@ -18,6 +18,38 @@ export default class AppSpan extends Vue {
*/
@Prop() public value?: any;
/**
* 数据类型
*
* @type {string}
* @memberof AppSpan
*/
@Prop() public dataType?: string;
/**
* 单位名称
*
* @type {string}
* @memberof AppSpan
*/
@Prop() public unitName?: string;
/**
* 精度
*
* @type {string}
* @memberof AppFormatData
*/
@Prop({default:'2'}) public precision?:string;
/**
* 日期值格式化
*
* @type {string}
* @memberof AppSpan
*/
@Prop() public valueFormat?: string;
/**
* 当前表单项名称
*
......@@ -158,12 +190,51 @@ export default class AppSpan extends Vue {
}else{
if(this.$util.isEmpty(this.value)){
this.text = '';
}else if(this.dataType){
this.currencyFormat();
}else if(this.valueFormat){
this.dateFormat();
}else{
this.text = this.value;
}
}
}
/**
* 货币格式化
*
* @memberof AppSpan
*/
public currencyFormat(){
let number:any = Number(this.value);
let _unitName = this.unitName?this.unitName:'';
let _precision = Number(this.precision);
if(Object.is(this.dataType,"CURRENCY")){
this.text = Number(number.toFixed(_precision)).toLocaleString('en-US')+ ' '+ _unitName;
}else if(Object.is(this.dataType,"FLOAT") || Object.is(this.dataType,"DECIMAL")){
this.text = number.toFixed(_precision);
}else {
this.text = this.value;
}
}
/**
* 日期格式化
*
* @memberof AppSpan
*/
public dateFormat(){
if(this.valueFormat){
if(this.valueFormat.indexOf('%1$t') !== -1){
this.text= moment(this.data).format("YYYY-MM-DD HH:mm:ss");
}else if(this.valueFormat.indexOf('%1$s') == -1){
this.text= moment(this.data).format(this.valueFormat);
}else{
this.text= this.value;
}
}
}
}
</script>
......
app_web/src/pages/ou/ibzdepartment-mpickup-view/ibzdepartment-mpickup-view-base.vue
浏览文件 @ 354c2493
......@@ -826,6 +826,7 @@ export default class IBZDepartmentMPickupViewBase extends Vue {
* @memberof IBZDepartmentMPickupViewBase
*/
public onClickCancel(): void {
this.$emit('viewdataschange', null);
this.$emit('close', null);
}
......
app_web/src/pages/ou/ibzdepartment-pickup-view/ibzdepartment-pickup-view-base.vue
浏览文件 @ 354c2493
......@@ -661,6 +661,7 @@ export default class IBZDepartmentPickupViewBase extends Vue {
* @memberof IBZDepartmentPickupViewBase
*/
public onClickCancel(): void {
this.$emit('viewdataschange', null);
this.$emit('close', null);
}
......
app_web/src/pages/ou/ibzemployee-mpickup-view/ibzemployee-mpickup-view-base.vue
浏览文件 @ 354c2493
......@@ -826,6 +826,7 @@ export default class IBZEmployeeMPickupViewBase extends Vue {
* @memberof IBZEmployeeMPickupViewBase
*/
public onClickCancel(): void {
this.$emit('viewdataschange', null);
this.$emit('close', null);
}
......
app_web/src/pages/ou/ibzemployee-pickup-view/ibzemployee-pickup-view-base.vue
浏览文件 @ 354c2493
......@@ -661,6 +661,7 @@ export default class IBZEmployeePickupViewBase extends Vue {
* @memberof IBZEmployeePickupViewBase
*/
public onClickCancel(): void {
this.$emit('viewdataschange', null);
this.$emit('close', null);
}
......
app_web/src/pages/ou/ibzorganization-pickup-view/ibzorganization-pickup-view-base.vue
浏览文件 @ 354c2493
......@@ -661,6 +661,7 @@ export default class IBZOrganizationPickupViewBase extends Vue {
* @memberof IBZOrganizationPickupViewBase
*/
public onClickCancel(): void {
this.$emit('viewdataschange', null);
this.$emit('close', null);
}
......
app_web/src/pages/ou/ibzpost-pickup-view/ibzpost-pickup-view-base.vue
浏览文件 @ 354c2493
......@@ -661,6 +661,7 @@ export default class IBZPostPickupViewBase extends Vue {
* @memberof IBZPostPickupViewBase
*/
public onClickCancel(): void {
this.$emit('viewdataschange', null);
this.$emit('close', null);
}
......
app_web/src/service/ibzpost/ibzpost-service-base.ts
浏览文件 @ 354c2493
......@@ -48,7 +48,9 @@ export default class IBZPostServiceBase extends EntityService {
* @memberof IBZPostServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().get(`/ibzposts/${context.ibzpost}/select`,isloading);
let res:any = Http.getInstance().get(`/ibzposts/${context.ibzpost}/select`,isloading);
return res;
}
/**
......@@ -71,6 +73,7 @@ export default class IBZPostServiceBase extends EntityService {
}
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/ibzposts`,data,isloading);
return res;
}
......@@ -87,6 +90,7 @@ export default class IBZPostServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzposts/${context.ibzpost}`,data,isloading);
return res;
}
......@@ -100,7 +104,8 @@ export default class IBZPostServiceBase extends EntityService {
* @memberof IBZPostServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().delete(`/ibzposts/${context.ibzpost}`,isloading);
let res:any = Http.getInstance().delete(`/ibzposts/${context.ibzpost}`,isloading);
return res;
}
/**
......@@ -114,6 +119,7 @@ export default class IBZPostServiceBase extends EntityService {
*/
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/ibzposts/${context.ibzpost}`,isloading);
return res;
}
......@@ -129,6 +135,7 @@ export default class IBZPostServiceBase extends EntityService {
public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/ibzposts/getdraft`,isloading);
res.data.ibzpost = data.ibzpost;
return res;
}
......@@ -142,7 +149,8 @@ export default class IBZPostServiceBase extends EntityService {
* @memberof IBZPostServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().post(`/ibzposts/${context.ibzpost}/checkkey`,data,isloading);
let res:any = Http.getInstance().post(`/ibzposts/${context.ibzpost}/checkkey`,data,isloading);
return res;
}
/**
......@@ -158,6 +166,7 @@ export default class IBZPostServiceBase extends EntityService {
let masterData:any = {};
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzposts/${context.ibzpost}/save`,data,isloading);
return res;
}
......@@ -172,6 +181,21 @@ export default class IBZPostServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/ibzposts/fetchdefault`,tempData,isloading);
let res:any = Http.getInstance().get(`/ibzposts/fetchdefault`,tempData,isloading);
return res;
}
/**
* searchDefault接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof IBZPostServiceBase
*/
public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().post(`/ibzposts/searchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_web/src/service/ibzteam/ibzteam-service-base.ts
浏览文件 @ 354c2493
......@@ -48,7 +48,9 @@ export default class IBZTeamServiceBase extends EntityService {
* @memberof IBZTeamServiceBase
*/
public async Select(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().get(`/ibzteams/${context.ibzteam}/select`,isloading);
let res:any = Http.getInstance().get(`/ibzteams/${context.ibzteam}/select`,isloading);
return res;
}
/**
......@@ -62,21 +64,6 @@ export default class IBZTeamServiceBase extends EntityService {
*/
public async Create(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
ibzteammembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.teammemberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
if(!data.srffrontuf || data.srffrontuf !== "1"){
data[this.APPDEKEY] = null;
......@@ -87,6 +74,7 @@ export default class IBZTeamServiceBase extends EntityService {
let tempContext:any = JSON.parse(JSON.stringify(context));
let res:any = await Http.getInstance().post(`/ibzteams`,data,isloading);
this.tempStorage.setItem(tempContext.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
......@@ -101,24 +89,9 @@ export default class IBZTeamServiceBase extends EntityService {
*/
public async Update(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
ibzteammembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.teammemberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().put(`/ibzteams/${context.ibzteam}`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
......@@ -132,7 +105,8 @@ export default class IBZTeamServiceBase extends EntityService {
* @memberof IBZTeamServiceBase
*/
public async Remove(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().delete(`/ibzteams/${context.ibzteam}`,isloading);
let res:any = Http.getInstance().delete(`/ibzteams/${context.ibzteam}`,isloading);
return res;
}
/**
......@@ -146,7 +120,7 @@ export default class IBZTeamServiceBase extends EntityService {
*/
public async Get(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/ibzteams/${context.ibzteam}`,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
......@@ -162,7 +136,7 @@ export default class IBZTeamServiceBase extends EntityService {
public async GetDraft(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let res:any = await Http.getInstance().get(`/ibzteams/getdraft`,isloading);
res.data.ibzteam = data.ibzteam;
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
......@@ -176,7 +150,8 @@ export default class IBZTeamServiceBase extends EntityService {
* @memberof IBZTeamServiceBase
*/
public async CheckKey(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
return Http.getInstance().post(`/ibzteams/${context.ibzteam}/checkkey`,data,isloading);
let res:any = Http.getInstance().post(`/ibzteams/${context.ibzteam}/checkkey`,data,isloading);
return res;
}
/**
......@@ -190,24 +165,9 @@ export default class IBZTeamServiceBase extends EntityService {
*/
public async Save(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let masterData:any = {};
let ibzteammembersData:any = [];
if(!Object.is(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers'),'undefined')){
ibzteammembersData = JSON.parse(this.tempStorage.getItem(context.srfsessionkey+'_ibzteammembers') as any);
if(ibzteammembersData && ibzteammembersData.length && ibzteammembersData.length > 0){
ibzteammembersData.forEach((item:any) => {
if(item.srffrontuf){
if(Object.is(item.srffrontuf,"0")){
item.teammemberid = null;
}
delete item.srffrontuf;
}
});
}
}
masterData.ibzteammembers = ibzteammembersData;
Object.assign(data,masterData);
let res:any = await Http.getInstance().post(`/ibzteams/${context.ibzteam}/save`,data,isloading);
this.tempStorage.setItem(context.srfsessionkey+'_ibzteammembers',JSON.stringify(res.data.ibzteammembers));
return res;
}
......@@ -222,6 +182,21 @@ export default class IBZTeamServiceBase extends EntityService {
*/
public async FetchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().get(`/ibzteams/fetchdefault`,tempData,isloading);
let res:any = Http.getInstance().get(`/ibzteams/fetchdefault`,tempData,isloading);
return res;
}
/**
* searchDefault接口方法
*
* @param {*} [context={}]
* @param {*} [data={}]
* @param {boolean} [isloading]
* @returns {Promise<any>}
* @memberof IBZTeamServiceBase
*/
public async searchDefault(context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
let tempData:any = JSON.parse(JSON.stringify(data));
return Http.getInstance().post(`/ibzteams/searchdefault`,tempData,isloading);
}
}
\ No newline at end of file
app_web/src/utils/app-popover/app-popover.less
浏览文件 @ 354c2493
.el-popover {
overflow-y: auto;
//z-index: 99 !important;
background: #ffffff;
border: 1px solid #dee0e4;
padding: 0px;
z-index: 2000;
color: var(--app-color-font-content);
line-height: 1.4;
text-align: justify;
font-size: 14px;
overflow-y: hidden;
overflow-x: hidden;
.el-card__header {
padding: 5px 10px;
border-bottom: 1px solid #dee0e4;
color: var(--app-color-font-content);
}
.el-card{
min-width: 150px;
border: none;
background-color: #ffffff;
color: var(--app-color-font-content);
}
.el-card__body {
padding: 0px;
overflow-x:hidden;
overflow-y: auto;
.viewcontainer2{
.content-container{
margin: 0;
}
}
}
}
.clearfix{
position: relative;
.cancel{
position: absolute;
right: 5px;
top: 5px;
}
.app-popover-wrapper {
position: absolute;
top: 0;
right: 0;
bottom: 0;
left: 0;
.app-popover.app-popper {
border-radius: 5px;
overflow: auto;
border: 1px solid #e8e8e8;
padding: 5px;
background: #e8e8e8;
}
}
\ No newline at end of file
app_web/src/widgets/ibzdepartment/default-searchform/default-searchform-base.vue
浏览文件 @ 354c2493
......@@ -7,18 +7,21 @@
<i-col v-show="detailsModel.n_deptcode_like.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_deptcode_like' :itemRules="this.rules.n_deptcode_like" class='' :caption="$t('entities.ibzdepartment.default_searchform.details.n_deptcode_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_deptcode_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_deptcode_like" @enter="onEnter($event)" :disabled="detailsModel.n_deptcode_like.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_deptname_like.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_deptname_like' :itemRules="this.rules.n_deptname_like" class='' :caption="$t('entities.ibzdepartment.default_searchform.details.n_deptname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_deptname_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_deptname_like" @enter="onEnter($event)" :disabled="detailsModel.n_deptname_like.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_bcode_like.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_bcode_like' :itemRules="this.rules.n_bcode_like" class='' :caption="$t('entities.ibzdepartment.default_searchform.details.n_bcode_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_bcode_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_bcode_like" @enter="onEnter($event)" :disabled="detailsModel.n_bcode_like.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
......
app_web/src/widgets/ibzdepartment/default-searchform/default-searchform-service.ts
浏览文件 @ 354c2493
......@@ -150,7 +150,6 @@ export default class DefaultService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzdepartment/main-form/main-form-base.vue
浏览文件 @ 354c2493
......@@ -6,12 +6,14 @@
<i-col v-show="detailsModel.deptcode.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='deptcode' :itemRules="this.rules.deptcode" class='' :caption="$t('entities.ibzdepartment.main_form.details.deptcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.deptcode.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.deptcode" @enter="onEnter($event)" unit="" :disabled="detailsModel.deptcode.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.deptname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='deptname' :itemRules="this.rules.deptname" class='' :caption="$t('entities.ibzdepartment.main_form.details.deptname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.deptname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.deptname" @enter="onEnter($event)" unit="" :disabled="detailsModel.deptname.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
......@@ -30,18 +32,21 @@
<i-col v-show="detailsModel.shortname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='shortname' :itemRules="this.rules.shortname" class='' :caption="$t('entities.ibzdepartment.main_form.details.shortname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.shortname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.shortname" @enter="onEnter($event)" unit="" :disabled="detailsModel.shortname.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.bcode.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='bcode' :itemRules="this.rules.bcode" class='' :caption="$t('entities.ibzdepartment.main_form.details.bcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.bcode.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.bcode" @enter="onEnter($event)" unit="" :disabled="detailsModel.bcode.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.deptlevel.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='deptlevel' :itemRules="this.rules.deptlevel" class='' :caption="$t('entities.ibzdepartment.main_form.details.deptlevel')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.deptlevel.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.deptlevel" @enter="onEnter($event)" unit="" :disabled="detailsModel.deptlevel.disabled" type='number' style=""></input-box>
</app-form-item>
</i-col>
......@@ -69,20 +74,23 @@
<i-col v-show="detailsModel.showorder.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='showorder' :itemRules="this.rules.showorder" class='' :caption="$t('entities.ibzdepartment.main_form.details.showorder')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.showorder.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.showorder" @enter="onEnter($event)" unit="" :disabled="detailsModel.showorder.disabled" type='number' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.createdate.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='createdate' :itemRules="this.rules.createdate" class='' :caption="$t('entities.ibzdepartment.main_form.details.createdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createdate.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='createdate' :value="data.createdate" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
<app-span name='createdate' :value="data.createdate" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.updatedate.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='updatedate' :itemRules="this.rules.updatedate" class='' :caption="$t('entities.ibzdepartment.main_form.details.updatedate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updatedate.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='updatedate' :value="data.updatedate" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
<app-span name='updatedate' :value="data.updatedate" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
</app-form-item>
</i-col>
......@@ -1483,9 +1491,6 @@ export default class MainBase extends Vue implements ControlInterface {
}
const data = response.data;
if(data.ibzdepartment){
Object.assign(this.context,{ibzdepartment:data.ibzdepartment})
}
this.resetDraftFormStates();
this.onFormLoad(data,'loadDraft');
this.$emit('load', data);
......
app_web/src/widgets/ibzdepartment/main-form/main-form-service.ts
浏览文件 @ 354c2493
......@@ -165,7 +165,6 @@ export default class MainService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzdepartment/main-grid/main-grid-base.vue
浏览文件 @ 354c2493
......@@ -651,7 +651,7 @@ export default class MainBase extends Vue implements ControlInterface {
*
* @memberof MainBase
*/
public defaultUpdateItems:Array<any> =['srfkey'];
public defaultUpdateItems:Array<any> =[];
/**
* 选中行数据
......@@ -1695,7 +1695,7 @@ export default class MainBase extends Vue implements ControlInterface {
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
}else{
errorItems.forEach((item:any,index:number)=>{
this.$Notice.error({ title: (this.$t('app.commonWords.saveFailed') as string), desc: item.majorentityname+(this.$t('app.commonWords.saveFailed') as string)+'!' });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: errorMessage[index].data.message });
console.error(errorMessage[index]);
});
}
......
app_web/src/widgets/ibzdepartment/main-grid/main-grid-model.ts
浏览文件 @ 354c2493
......@@ -60,6 +60,7 @@ export default class MainModel {
name: 'srfkey',
prop: 'deptid',
dataType: 'TEXT',
isEditable:true
},
{
name: 'leadername',
......
app_web/src/widgets/ibzdepartment/main-grid/main-grid-service.ts
浏览文件 @ 354c2493
......@@ -99,7 +99,7 @@ export default class MainService extends ControlService {
*/
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
......@@ -158,14 +158,14 @@ export default class MainService extends ControlService {
*/
@Errorlog
public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Data,Context,isloading);
result = _appEntityService[action](Context,Data,isloading);
}else{
result =_appEntityService.Update(Data,Context,isloading);
result =_appEntityService.Update(Context,Data,isloading);
}
result.then((response) => {
this.handleResponse(action, response);
......@@ -305,5 +305,41 @@ export default class MainService extends ControlService {
});
})
}
/**
* 处理请求数据(修改或增加数据)
*
* @param action 行为
* @param data 数据
* @memberof MainService
*/
public handleRequestDataWithUpdate(action: string,context:any ={},data: any = {},isMerge:boolean = false){
let model: any = this.getMode();
if (!model && model.getDataItems instanceof Function) {
return data;
}
let dataItems: any[] = model.getDataItems();
let requestData:any = {};
if(isMerge && (data && data.viewparams)){
Object.assign(requestData,data.viewparams);
}
dataItems.forEach((item:any) =>{
if(item && item.dataType && Object.is(item.dataType,'FONTKEY')){
if(item && item.prop && item.name ){
requestData[item.prop] = context[item.name];
}
}else{
if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
requestData[item.prop] = data[item.name];
}
}
});
let tempContext:any = JSON.parse(JSON.stringify(context));
if(tempContext && tempContext.srfsessionid){
tempContext.srfsessionkey = tempContext.srfsessionid;
delete tempContext.srfsessionid;
}
return {context:tempContext,data:requestData};
}
}
\ No newline at end of file
app_web/src/widgets/ibzdepartment/new-form-form/new-form-form-base.vue
浏览文件 @ 354c2493
......@@ -9,12 +9,14 @@
<i-col v-show="detailsModel.deptcode.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='deptcode' :itemRules="this.rules.deptcode" class='' :caption="$t('entities.ibzdepartment.newform_form.details.deptcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.deptcode.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.deptcode" @enter="onEnter($event)" unit="" :disabled="detailsModel.deptcode.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.deptname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='deptname' :itemRules="this.rules.deptname" class='' :caption="$t('entities.ibzdepartment.newform_form.details.deptname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.deptname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.deptname" @enter="onEnter($event)" unit="" :disabled="detailsModel.deptname.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
......@@ -1280,9 +1282,6 @@ export default class NewFormBase extends Vue implements ControlInterface {
}
const data = response.data;
if(data.ibzdepartment){
Object.assign(this.context,{ibzdepartment:data.ibzdepartment})
}
this.resetDraftFormStates();
this.onFormLoad(data,'loadDraft');
this.$emit('load', data);
......
app_web/src/widgets/ibzdepartment/new-form-form/new-form-form-service.ts
浏览文件 @ 354c2493
......@@ -165,7 +165,6 @@ export default class NewFormService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzdept-member/main-form/main-form-base.vue
浏览文件 @ 354c2493
......@@ -1215,9 +1215,6 @@ export default class MainBase extends Vue implements ControlInterface {
}
const data = response.data;
if(data.ibzdeptmember){
Object.assign(this.context,{ibzdeptmember:data.ibzdeptmember})
}
this.resetDraftFormStates();
this.onFormLoad(data,'loadDraft');
this.$emit('load', data);
......
app_web/src/widgets/ibzdept-member/main-form/main-form-service.ts
浏览文件 @ 354c2493
......@@ -174,7 +174,6 @@ export default class MainService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzdept-member/main-grid/main-grid-base.vue
浏览文件 @ 354c2493
......@@ -56,7 +56,7 @@
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='deptname' editorType="PICKER" :value="row.deptname"></app-span>
<app-span name='deptname' editorType="PICKER" :value="row.deptname" dataType="PICKUPTEXT" precision="0" ></app-span>
</template>
</template>
</el-table-column>
......@@ -96,7 +96,7 @@
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='postname' editorType="PICKER" :value="row.postname"></app-span>
<app-span name='postname' editorType="PICKER" :value="row.postname" dataType="PICKUPTEXT" precision="0" ></app-span>
</template>
</template>
</el-table-column>
......@@ -136,7 +136,7 @@
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='personname' editorType="PICKER" :value="row.personname"></app-span>
<app-span name='personname' editorType="PICKER" :value="row.personname" dataType="PICKUPTEXT" precision="0" ></app-span>
</template>
</template>
</el-table-column>
......@@ -160,10 +160,11 @@
@change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
</input-box>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='deptid' editorType="HIDDEN" :value="row.deptid"></app-span>
<app-span name='deptid' editorType="HIDDEN" :value="row.deptid" dataType="PICKUP" precision="0" ></app-span>
</template>
</template>
</el-table-column>
......@@ -187,10 +188,11 @@
@change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
</input-box>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='postid' editorType="HIDDEN" :value="row.postid"></app-span>
<app-span name='postid' editorType="HIDDEN" :value="row.postid" dataType="PICKUP" precision="0" ></app-span>
</template>
</template>
</el-table-column>
......@@ -214,10 +216,11 @@
@change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
</input-box>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='userid' editorType="HIDDEN" :value="row.userid"></app-span>
<app-span name='userid' editorType="HIDDEN" :value="row.userid" dataType="PICKUP" precision="0" ></app-span>
</template>
</template>
</el-table-column>
......@@ -684,7 +687,7 @@ export default class MainBase extends Vue implements ControlInterface {
*
* @memberof MainBase
*/
public defaultUpdateItems:Array<any> =['postid','deptid','postname','userid','personname','deptname','srfkey'];
public defaultUpdateItems:Array<any> =[,,,,,,];
/**
* 选中行数据
......@@ -1694,7 +1697,7 @@ export default class MainBase extends Vue implements ControlInterface {
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
}else{
errorItems.forEach((item:any,index:number)=>{
this.$Notice.error({ title: (this.$t('app.commonWords.saveFailed') as string), desc: item.majorentityname+(this.$t('app.commonWords.saveFailed') as string)+'!' });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: errorMessage[index].data.message });
console.error(errorMessage[index]);
});
}
......
app_web/src/widgets/ibzdept-member/main-grid/main-grid-model.ts
浏览文件 @ 354c2493
......@@ -30,31 +30,37 @@ export default class MainModel {
name: 'postid',
prop: 'postid',
dataType: 'PICKUP',
isEditable:true
},
{
name: 'deptid',
prop: 'deptid',
dataType: 'PICKUP',
isEditable:true
},
{
name: 'postname',
prop: 'postname',
dataType: 'PICKUPTEXT',
isEditable:true
},
{
name: 'userid',
prop: 'userid',
dataType: 'PICKUP',
isEditable:true
},
{
name: 'personname',
prop: 'personname',
dataType: 'PICKUPTEXT',
isEditable:true
},
{
name: 'deptname',
prop: 'deptname',
dataType: 'PICKUPTEXT',
isEditable:true
},
{
name: 'srfmajortext',
......@@ -70,6 +76,7 @@ export default class MainModel {
name: 'srfkey',
prop: 'memberid',
dataType: 'TEXT',
isEditable:true
},
{
name: 'ibzdeptmember',
......
app_web/src/widgets/ibzdept-member/main-grid/main-grid-service.ts
浏览文件 @ 354c2493
......@@ -135,7 +135,7 @@ export default class MainService extends ControlService {
*/
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
......@@ -194,14 +194,14 @@ export default class MainService extends ControlService {
*/
@Errorlog
public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Data,Context,isloading);
result = _appEntityService[action](Context,Data,isloading);
}else{
result =_appEntityService.Update(Data,Context,isloading);
result =_appEntityService.Update(Context,Data,isloading);
}
result.then((response) => {
this.handleResponse(action, response);
......@@ -341,5 +341,41 @@ export default class MainService extends ControlService {
});
})
}
/**
* 处理请求数据(修改或增加数据)
*
* @param action 行为
* @param data 数据
* @memberof MainService
*/
public handleRequestDataWithUpdate(action: string,context:any ={},data: any = {},isMerge:boolean = false){
let model: any = this.getMode();
if (!model && model.getDataItems instanceof Function) {
return data;
}
let dataItems: any[] = model.getDataItems();
let requestData:any = {};
if(isMerge && (data && data.viewparams)){
Object.assign(requestData,data.viewparams);
}
dataItems.forEach((item:any) =>{
if(item && item.dataType && Object.is(item.dataType,'FONTKEY')){
if(item && item.prop && item.name ){
requestData[item.prop] = context[item.name];
}
}else{
if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
requestData[item.prop] = data[item.name];
}
}
});
let tempContext:any = JSON.parse(JSON.stringify(context));
if(tempContext && tempContext.srfsessionid){
tempContext.srfsessionkey = tempContext.srfsessionid;
delete tempContext.srfsessionid;
}
return {context:tempContext,data:requestData};
}
}
\ No newline at end of file
app_web/src/widgets/ibzemployee/default-searchform/default-searchform-base.vue
浏览文件 @ 354c2493
......@@ -7,18 +7,21 @@
<i-col v-show="detailsModel.n_usercode_like.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_usercode_like' :itemRules="this.rules.n_usercode_like" class='' :caption="$t('entities.ibzemployee.default_searchform.details.n_usercode_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_usercode_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_usercode_like" @enter="onEnter($event)" :disabled="detailsModel.n_usercode_like.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_personname_like.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_personname_like' :itemRules="this.rules.n_personname_like" class='' :caption="$t('entities.ibzemployee.default_searchform.details.n_personname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_personname_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_personname_like" @enter="onEnter($event)" :disabled="detailsModel.n_personname_like.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_mdeptname_like.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_mdeptname_like' :itemRules="this.rules.n_mdeptname_like" class='' :caption="$t('entities.ibzemployee.default_searchform.details.n_mdeptname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_mdeptname_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_mdeptname_like" @enter="onEnter($event)" :disabled="detailsModel.n_mdeptname_like.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
......
app_web/src/widgets/ibzemployee/default-searchform/default-searchform-service.ts
浏览文件 @ 354c2493
......@@ -150,7 +150,6 @@ export default class DefaultService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzemployee/main-form/main-form-service.ts
浏览文件 @ 354c2493
......@@ -174,7 +174,6 @@ export default class MainService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzemployee/main-grid/main-grid-base.vue
浏览文件 @ 354c2493
......@@ -603,7 +603,7 @@ export default class MainBase extends Vue implements ControlInterface {
*
* @memberof MainBase
*/
public defaultUpdateItems:Array<any> =['srfkey'];
public defaultUpdateItems:Array<any> =[];
/**
* 选中行数据
......@@ -1631,7 +1631,7 @@ export default class MainBase extends Vue implements ControlInterface {
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
}else{
errorItems.forEach((item:any,index:number)=>{
this.$Notice.error({ title: (this.$t('app.commonWords.saveFailed') as string), desc: item.majorentityname+(this.$t('app.commonWords.saveFailed') as string)+'!' });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: errorMessage[index].data.message });
console.error(errorMessage[index]);
});
}
......
app_web/src/widgets/ibzemployee/main-grid/main-grid-model.ts
浏览文件 @ 354c2493
......@@ -70,6 +70,7 @@ export default class MainModel {
name: 'srfkey',
prop: 'userid',
dataType: 'TEXT',
isEditable:true
},
{
name: 'loginname',
......
app_web/src/widgets/ibzemployee/main-grid/main-grid-service.ts
浏览文件 @ 354c2493
......@@ -99,7 +99,7 @@ export default class MainService extends ControlService {
*/
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
......@@ -158,14 +158,14 @@ export default class MainService extends ControlService {
*/
@Errorlog
public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Data,Context,isloading);
result = _appEntityService[action](Context,Data,isloading);
}else{
result =_appEntityService.Update(Data,Context,isloading);
result =_appEntityService.Update(Context,Data,isloading);
}
result.then((response) => {
this.handleResponse(action, response);
......@@ -305,5 +305,41 @@ export default class MainService extends ControlService {
});
})
}
/**
* 处理请求数据(修改或增加数据)
*
* @param action 行为
* @param data 数据
* @memberof MainService
*/
public handleRequestDataWithUpdate(action: string,context:any ={},data: any = {},isMerge:boolean = false){
let model: any = this.getMode();
if (!model && model.getDataItems instanceof Function) {
return data;
}
let dataItems: any[] = model.getDataItems();
let requestData:any = {};
if(isMerge && (data && data.viewparams)){
Object.assign(requestData,data.viewparams);
}
dataItems.forEach((item:any) =>{
if(item && item.dataType && Object.is(item.dataType,'FONTKEY')){
if(item && item.prop && item.name ){
requestData[item.prop] = context[item.name];
}
}else{
if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
requestData[item.prop] = data[item.name];
}
}
});
let tempContext:any = JSON.parse(JSON.stringify(context));
if(tempContext && tempContext.srfsessionid){
tempContext.srfsessionkey = tempContext.srfsessionid;
delete tempContext.srfsessionid;
}
return {context:tempContext,data:requestData};
}
}
\ No newline at end of file
app_web/src/widgets/ibzemployee/new-form-form/new-form-form-base.vue
浏览文件 @ 354c2493
......@@ -9,18 +9,21 @@
<i-col v-show="detailsModel.usercode.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='usercode' :itemRules="this.rules.usercode" class='' :caption="$t('entities.ibzemployee.newform_form.details.usercode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.usercode.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.usercode" @enter="onEnter($event)" unit="" :disabled="detailsModel.usercode.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.personname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='personname' :itemRules="this.rules.personname" class='' :caption="$t('entities.ibzemployee.newform_form.details.personname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.personname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.personname" @enter="onEnter($event)" unit="" :disabled="detailsModel.personname.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.loginname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='loginname' :itemRules="this.rules.loginname" class='' :caption="$t('entities.ibzemployee.newform_form.details.loginname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.loginname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.loginname" @enter="onEnter($event)" unit="" :disabled="detailsModel.loginname.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
......@@ -1371,9 +1374,6 @@ export default class NewFormBase extends Vue implements ControlInterface {
}
const data = response.data;
if(data.ibzemployee){
Object.assign(this.context,{ibzemployee:data.ibzemployee})
}
this.resetDraftFormStates();
this.onFormLoad(data,'loadDraft');
this.$emit('load', data);
......
app_web/src/widgets/ibzemployee/new-form-form/new-form-form-service.ts
浏览文件 @ 354c2493
......@@ -174,7 +174,6 @@ export default class NewFormService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzorganization/default-searchform/default-searchform-base.vue
浏览文件 @ 354c2493
......@@ -7,12 +7,14 @@
<i-col v-show="detailsModel.orgcode.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='orgcode' :itemRules="this.rules.orgcode" class='' :caption="$t('entities.ibzorganization.default_searchform.details.orgcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgcode.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.orgcode" @enter="onEnter($event)" :disabled="detailsModel.orgcode.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_orgname_like.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_orgname_like' :itemRules="this.rules.n_orgname_like" class='' :caption="$t('entities.ibzorganization.default_searchform.details.n_orgname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_orgname_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.n_orgname_like" @enter="onEnter($event)" :disabled="detailsModel.n_orgname_like.disabled" type='text' style="width:100px;"></input-box>
</app-form-item>
</i-col>
......
app_web/src/widgets/ibzorganization/default-searchform/default-searchform-service.ts
浏览文件 @ 354c2493
......@@ -153,7 +153,6 @@ export default class DefaultService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzorganization/main-form/main-form-base.vue
浏览文件 @ 354c2493
......@@ -6,12 +6,14 @@
<i-col v-show="detailsModel.orgcode.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='orgcode' :itemRules="this.rules.orgcode" class='' :caption="$t('entities.ibzorganization.main_form.details.orgcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgcode.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.orgcode" @enter="onEnter($event)" unit="" :disabled="detailsModel.orgcode.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.orgname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='orgname' :itemRules="this.rules.orgname" class='' :caption="$t('entities.ibzorganization.main_form.details.orgname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.orgname" @enter="onEnter($event)" unit="" :disabled="detailsModel.orgname.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
......@@ -24,32 +26,37 @@
<i-col v-show="detailsModel.orglevel.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='orglevel' :itemRules="this.rules.orglevel" class='' :caption="$t('entities.ibzorganization.main_form.details.orglevel')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orglevel.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.orglevel" @enter="onEnter($event)" unit="" :disabled="detailsModel.orglevel.disabled" type='number' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.shortname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='shortname' :itemRules="this.rules.shortname" class='' :caption="$t('entities.ibzorganization.main_form.details.shortname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.shortname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.shortname" @enter="onEnter($event)" unit="" :disabled="detailsModel.shortname.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.showorder.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='showorder' :itemRules="this.rules.showorder" class='' :caption="$t('entities.ibzorganization.main_form.details.showorder')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.showorder.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.showorder" @enter="onEnter($event)" unit="" :disabled="detailsModel.showorder.disabled" type='number' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.createdate.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='createdate' :itemRules="this.rules.createdate" class='' :caption="$t('entities.ibzorganization.main_form.details.createdate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.createdate.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='createdate' :value="data.createdate" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
<app-span name='createdate' :value="data.createdate" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.updatedate.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='updatedate' :itemRules="this.rules.updatedate" class='' :caption="$t('entities.ibzorganization.main_form.details.updatedate')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.updatedate.error" :isEmptyCaption="false" labelPos="LEFT">
<app-span name='updatedate' :value="data.updatedate" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
<app-span name='updatedate' :value="data.updatedate" valueFormat="%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS" :data="data" :context="context" :viewparams="viewparams" :localContext ='{ }' :localParam ='{ }' style=""></app-span>
</app-form-item>
</i-col>
......@@ -1332,9 +1339,6 @@ export default class MainBase extends Vue implements ControlInterface {
}
const data = response.data;
if(data.ibzorganization){
Object.assign(this.context,{ibzorganization:data.ibzorganization})
}
this.resetDraftFormStates();
this.onFormLoad(data,'loadDraft');
this.$emit('load', data);
......
app_web/src/widgets/ibzorganization/main-form/main-form-service.ts
浏览文件 @ 354c2493
......@@ -153,7 +153,6 @@ export default class MainService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzorganization/main-grid/main-grid-base.vue
浏览文件 @ 354c2493
......@@ -603,7 +603,7 @@ export default class MainBase extends Vue implements ControlInterface {
*
* @memberof MainBase
*/
public defaultUpdateItems:Array<any> =['srfkey'];
public defaultUpdateItems:Array<any> =[];
/**
* 选中行数据
......@@ -1615,7 +1615,7 @@ export default class MainBase extends Vue implements ControlInterface {
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
}else{
errorItems.forEach((item:any,index:number)=>{
this.$Notice.error({ title: (this.$t('app.commonWords.saveFailed') as string), desc: item.majorentityname+(this.$t('app.commonWords.saveFailed') as string)+'!' });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: errorMessage[index].data.message });
console.error(errorMessage[index]);
});
}
......
app_web/src/widgets/ibzorganization/main-grid/main-grid-model.ts
浏览文件 @ 354c2493
......@@ -55,6 +55,7 @@ export default class MainModel {
name: 'srfkey',
prop: 'orgid',
dataType: 'TEXT',
isEditable:true
},
{
name: 'srfdataaccaction',
......
app_web/src/widgets/ibzorganization/main-grid/main-grid-service.ts
浏览文件 @ 354c2493
......@@ -99,7 +99,7 @@ export default class MainService extends ControlService {
*/
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
......@@ -158,14 +158,14 @@ export default class MainService extends ControlService {
*/
@Errorlog
public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Data,Context,isloading);
result = _appEntityService[action](Context,Data,isloading);
}else{
result =_appEntityService.Update(Data,Context,isloading);
result =_appEntityService.Update(Context,Data,isloading);
}
result.then((response) => {
this.handleResponse(action, response);
......@@ -305,5 +305,41 @@ export default class MainService extends ControlService {
});
})
}
/**
* 处理请求数据(修改或增加数据)
*
* @param action 行为
* @param data 数据
* @memberof MainService
*/
public handleRequestDataWithUpdate(action: string,context:any ={},data: any = {},isMerge:boolean = false){
let model: any = this.getMode();
if (!model && model.getDataItems instanceof Function) {
return data;
}
let dataItems: any[] = model.getDataItems();
let requestData:any = {};
if(isMerge && (data && data.viewparams)){
Object.assign(requestData,data.viewparams);
}
dataItems.forEach((item:any) =>{
if(item && item.dataType && Object.is(item.dataType,'FONTKEY')){
if(item && item.prop && item.name ){
requestData[item.prop] = context[item.name];
}
}else{
if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
requestData[item.prop] = data[item.name];
}
}
});
let tempContext:any = JSON.parse(JSON.stringify(context));
if(tempContext && tempContext.srfsessionid){
tempContext.srfsessionkey = tempContext.srfsessionid;
delete tempContext.srfsessionid;
}
return {context:tempContext,data:requestData};
}
}
\ No newline at end of file
app_web/src/widgets/ibzorganization/new-form-form/new-form-form-base.vue
浏览文件 @ 354c2493
......@@ -9,12 +9,14 @@
<i-col v-show="detailsModel.orgcode.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='orgcode' :itemRules="this.rules.orgcode" class='' :caption="$t('entities.ibzorganization.newform_form.details.orgcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgcode.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.orgcode" @enter="onEnter($event)" unit="" :disabled="detailsModel.orgcode.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.orgname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='orgname' :itemRules="this.rules.orgname" class='' :caption="$t('entities.ibzorganization.newform_form.details.orgname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.orgname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.orgname" @enter="onEnter($event)" unit="" :disabled="detailsModel.orgname.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
......@@ -1223,9 +1225,6 @@ export default class NewFormBase extends Vue implements ControlInterface {
}
const data = response.data;
if(data.ibzorganization){
Object.assign(this.context,{ibzorganization:data.ibzorganization})
}
this.resetDraftFormStates();
this.onFormLoad(data,'loadDraft');
this.$emit('load', data);
......
app_web/src/widgets/ibzorganization/new-form-form/new-form-form-service.ts
浏览文件 @ 354c2493
......@@ -153,7 +153,6 @@ export default class NewFormService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzpost/default-searchform/default-searchform-service.ts
浏览文件 @ 354c2493
......@@ -150,7 +150,6 @@ export default class DefaultService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzpost/main-form/main-form-base.vue
浏览文件 @ 354c2493
......@@ -9,12 +9,14 @@
<i-col v-show="detailsModel.postcode.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='postcode' :itemRules="this.rules.postcode" class='' :caption="$t('entities.ibzpost.main_form.details.postcode')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.postcode.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.postcode" @enter="onEnter($event)" unit="" :disabled="detailsModel.postcode.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.postname.visible" :style="{}" :lg="{ span: 24, offset: 0 }">
<app-form-item name='postname' :itemRules="this.rules.postname" class='' :caption="$t('entities.ibzpost.main_form.details.postname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.postname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.postname" @enter="onEnter($event)" unit="" :disabled="detailsModel.postname.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
......@@ -1180,9 +1182,6 @@ export default class MainBase extends Vue implements ControlInterface {
}
const data = response.data;
if(data.ibzpost){
Object.assign(this.context,{ibzpost:data.ibzpost})
}
this.resetDraftFormStates();
this.onFormLoad(data,'loadDraft');
this.$emit('load', data);
......
app_web/src/widgets/ibzpost/main-form/main-form-service.ts
浏览文件 @ 354c2493
......@@ -150,7 +150,6 @@ export default class MainService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzpost/main-grid/main-grid-base.vue
浏览文件 @ 354c2493
......@@ -519,7 +519,7 @@ export default class MainBase extends Vue implements ControlInterface {
*
* @memberof MainBase
*/
public defaultUpdateItems:Array<any> =['srfkey'];
public defaultUpdateItems:Array<any> =[];
/**
* 选中行数据
......@@ -1475,7 +1475,7 @@ export default class MainBase extends Vue implements ControlInterface {
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
}else{
errorItems.forEach((item:any,index:number)=>{
this.$Notice.error({ title: (this.$t('app.commonWords.saveFailed') as string), desc: item.majorentityname+(this.$t('app.commonWords.saveFailed') as string)+'!' });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: errorMessage[index].data.message });
console.error(errorMessage[index]);
});
}
......
app_web/src/widgets/ibzpost/main-grid/main-grid-model.ts
浏览文件 @ 354c2493
......@@ -55,6 +55,7 @@ export default class MainModel {
name: 'srfkey',
prop: 'postid',
dataType: 'TEXT',
isEditable:true
},
{
name: 'ibzpost',
......
app_web/src/widgets/ibzpost/main-grid/main-grid-service.ts
浏览文件 @ 354c2493
......@@ -99,7 +99,7 @@ export default class MainService extends ControlService {
*/
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
......@@ -158,14 +158,14 @@ export default class MainService extends ControlService {
*/
@Errorlog
public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Data,Context,isloading);
result = _appEntityService[action](Context,Data,isloading);
}else{
result =_appEntityService.Update(Data,Context,isloading);
result =_appEntityService.Update(Context,Data,isloading);
}
result.then((response) => {
this.handleResponse(action, response);
......@@ -305,5 +305,41 @@ export default class MainService extends ControlService {
});
})
}
/**
* 处理请求数据(修改或增加数据)
*
* @param action 行为
* @param data 数据
* @memberof MainService
*/
public handleRequestDataWithUpdate(action: string,context:any ={},data: any = {},isMerge:boolean = false){
let model: any = this.getMode();
if (!model && model.getDataItems instanceof Function) {
return data;
}
let dataItems: any[] = model.getDataItems();
let requestData:any = {};
if(isMerge && (data && data.viewparams)){
Object.assign(requestData,data.viewparams);
}
dataItems.forEach((item:any) =>{
if(item && item.dataType && Object.is(item.dataType,'FONTKEY')){
if(item && item.prop && item.name ){
requestData[item.prop] = context[item.name];
}
}else{
if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
requestData[item.prop] = data[item.name];
}
}
});
let tempContext:any = JSON.parse(JSON.stringify(context));
if(tempContext && tempContext.srfsessionid){
tempContext.srfsessionkey = tempContext.srfsessionid;
delete tempContext.srfsessionid;
}
return {context:tempContext,data:requestData};
}
}
\ No newline at end of file
app_web/src/widgets/ibzteam-member/main-form/main-form-base.vue
浏览文件 @ 354c2493
......@@ -1259,9 +1259,6 @@ export default class MainBase extends Vue implements ControlInterface {
}
const data = response.data;
if(data.ibzteammember){
Object.assign(this.context,{ibzteammember:data.ibzteammember})
}
this.resetDraftFormStates();
this.onFormLoad(data,'loadDraft');
this.$emit('load', data);
......
app_web/src/widgets/ibzteam-member/main-form/main-form-service.ts
浏览文件 @ 354c2493
......@@ -174,7 +174,6 @@ export default class MainService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzteam-member/main-grid/main-grid-base.vue
浏览文件 @ 354c2493
......@@ -56,7 +56,7 @@
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='personname' editorType="PICKER" :value="row.personname"></app-span>
<app-span name='personname' editorType="PICKER" :value="row.personname" dataType="PICKUPTEXT" precision="0" ></app-span>
</template>
</template>
</el-table-column>
......@@ -96,7 +96,7 @@
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='postname' editorType="PICKER" :value="row.postname"></app-span>
<app-span name='postname' editorType="PICKER" :value="row.postname" dataType="PICKUPTEXT" precision="0" ></app-span>
</template>
</template>
</el-table-column>
......@@ -120,10 +120,11 @@
@change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
</input-box>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='postid' editorType="HIDDEN" :value="row.postid"></app-span>
<app-span name='postid' editorType="HIDDEN" :value="row.postid" dataType="PICKUP" precision="0" ></app-span>
</template>
</template>
</el-table-column>
......@@ -147,10 +148,11 @@
@change="($event)=>{gridEditItemChange(row, column.property, $event, $index)}">
</input-box>
</app-form-item>
</template>
<template v-if="!actualIsOpenEdit">
<app-span name='userid' editorType="HIDDEN" :value="row.userid"></app-span>
<app-span name='userid' editorType="HIDDEN" :value="row.userid" dataType="PICKUP" precision="0" ></app-span>
</template>
</template>
</el-table-column>
......@@ -617,7 +619,7 @@ export default class MainBase extends Vue implements ControlInterface {
*
* @memberof MainBase
*/
public defaultUpdateItems:Array<any> =['postid','postname','userid','personname','srfkey'];
public defaultUpdateItems:Array<any> =[,,,,];
/**
* 选中行数据
......@@ -1601,7 +1603,7 @@ export default class MainBase extends Vue implements ControlInterface {
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
}else{
errorItems.forEach((item:any,index:number)=>{
this.$Notice.error({ title: (this.$t('app.commonWords.saveFailed') as string), desc: item.majorentityname+(this.$t('app.commonWords.saveFailed') as string)+'!' });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: errorMessage[index].data.message });
console.error(errorMessage[index]);
});
}
......
app_web/src/widgets/ibzteam-member/main-grid/main-grid-model.ts
浏览文件 @ 354c2493
......@@ -30,6 +30,7 @@ export default class MainModel {
name: 'postid',
prop: 'postid',
dataType: 'PICKUP',
isEditable:true
},
{
name: 'teamid',
......@@ -40,16 +41,19 @@ export default class MainModel {
name: 'postname',
prop: 'postname',
dataType: 'PICKUPTEXT',
isEditable:true
},
{
name: 'userid',
prop: 'userid',
dataType: 'PICKUP',
isEditable:true
},
{
name: 'personname',
prop: 'personname',
dataType: 'PICKUPTEXT',
isEditable:true
},
{
name: 'srfmajortext',
......@@ -65,6 +69,7 @@ export default class MainModel {
name: 'srfkey',
prop: 'teammemberid',
dataType: 'TEXT',
isEditable:true
},
{
name: 'ibzteammember',
......
app_web/src/widgets/ibzteam-member/main-grid/main-grid-service.ts
浏览文件 @ 354c2493
......@@ -123,7 +123,7 @@ export default class MainService extends ControlService {
*/
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
......@@ -182,14 +182,14 @@ export default class MainService extends ControlService {
*/
@Errorlog
public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Data,Context,isloading);
result = _appEntityService[action](Context,Data,isloading);
}else{
result =_appEntityService.Update(Data,Context,isloading);
result =_appEntityService.Update(Context,Data,isloading);
}
result.then((response) => {
this.handleResponse(action, response);
......@@ -329,5 +329,41 @@ export default class MainService extends ControlService {
});
})
}
/**
* 处理请求数据(修改或增加数据)
*
* @param action 行为
* @param data 数据
* @memberof MainService
*/
public handleRequestDataWithUpdate(action: string,context:any ={},data: any = {},isMerge:boolean = false){
let model: any = this.getMode();
if (!model && model.getDataItems instanceof Function) {
return data;
}
let dataItems: any[] = model.getDataItems();
let requestData:any = {};
if(isMerge && (data && data.viewparams)){
Object.assign(requestData,data.viewparams);
}
dataItems.forEach((item:any) =>{
if(item && item.dataType && Object.is(item.dataType,'FONTKEY')){
if(item && item.prop && item.name ){
requestData[item.prop] = context[item.name];
}
}else{
if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
requestData[item.prop] = data[item.name];
}
}
});
let tempContext:any = JSON.parse(JSON.stringify(context));
if(tempContext && tempContext.srfsessionid){
tempContext.srfsessionkey = tempContext.srfsessionid;
delete tempContext.srfsessionid;
}
return {context:tempContext,data:requestData};
}
}
\ No newline at end of file
app_web/src/widgets/ibzteam/default-searchform/default-searchform-service.ts
浏览文件 @ 354c2493
......@@ -150,7 +150,6 @@ export default class DefaultService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzteam/main-form/main-form-base.vue
浏览文件 @ 354c2493
......@@ -9,12 +9,14 @@
<i-col v-show="detailsModel.teamname.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='teamname' :itemRules="this.rules.teamname" class='' :caption="$t('entities.ibzteam.main_form.details.teamname')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.teamname.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.teamname" @enter="onEnter($event)" unit="" :disabled="detailsModel.teamname.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.memo.visible" :style="{}" :sm="{ span: 24, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 12, offset: 0 }" :xl="{ span: 12, offset: 0 }">
<app-form-item name='memo' :itemRules="this.rules.memo" class='' :caption="$t('entities.ibzteam.main_form.details.memo')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.memo.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box v-model="data.memo" @enter="onEnter($event)" unit="" :disabled="detailsModel.memo.disabled" type='text' style=""></input-box>
</app-form-item>
</i-col>
......@@ -1191,9 +1193,6 @@ export default class MainBase extends Vue implements ControlInterface {
}
const data = response.data;
if(data.ibzteam){
Object.assign(this.context,{ibzteam:data.ibzteam})
}
this.resetDraftFormStates();
this.onFormLoad(data,'loadDraft');
this.$emit('load', data);
......
app_web/src/widgets/ibzteam/main-form/main-form-service.ts
浏览文件 @ 354c2493
......@@ -150,7 +150,6 @@ export default class MainService extends ControlService {
});
}
/**
* 添加数据
*
......
app_web/src/widgets/ibzteam/main-grid/main-grid-base.vue
浏览文件 @ 354c2493
......@@ -507,7 +507,7 @@ export default class MainBase extends Vue implements ControlInterface {
*
* @memberof MainBase
*/
public defaultUpdateItems:Array<any> =['srfkey'];
public defaultUpdateItems:Array<any> =[];
/**
* 选中行数据
......@@ -1455,7 +1455,7 @@ export default class MainBase extends Vue implements ControlInterface {
this.$Notice.success({ title: '', desc: (this.$t('app.commonWords.saveSuccess') as string) });
}else{
errorItems.forEach((item:any,index:number)=>{
this.$Notice.error({ title: (this.$t('app.commonWords.saveFailed') as string), desc: item.majorentityname+(this.$t('app.commonWords.saveFailed') as string)+'!' });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: errorMessage[index].data.message });
console.error(errorMessage[index]);
});
}
......
app_web/src/widgets/ibzteam/main-grid/main-grid-model.ts
浏览文件 @ 354c2493
......@@ -50,6 +50,7 @@ export default class MainModel {
name: 'srfkey',
prop: 'teamid',
dataType: 'TEXT',
isEditable:true
},
{
name: 'ibzteam',
......
app_web/src/widgets/ibzteam/main-grid/main-grid-service.ts
浏览文件 @ 354c2493
......@@ -99,7 +99,7 @@ export default class MainService extends ControlService {
*/
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
......@@ -158,14 +158,14 @@ export default class MainService extends ControlService {
*/
@Errorlog
public update(action: string, context: any = {},data: any = {}, isloading?: boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data,true);
const {data:Data,context:Context} = this.handleRequestDataWithUpdate(action,context,data,true);
return new Promise((resolve: any, reject: any) => {
const _appEntityService: any = this.appEntityService;
let result: Promise<any>;
if (_appEntityService[action] && _appEntityService[action] instanceof Function) {
result = _appEntityService[action](Data,Context,isloading);
result = _appEntityService[action](Context,Data,isloading);
}else{
result =_appEntityService.Update(Data,Context,isloading);
result =_appEntityService.Update(Context,Data,isloading);
}
result.then((response) => {
this.handleResponse(action, response);
......@@ -305,5 +305,41 @@ export default class MainService extends ControlService {
});
})
}
/**
* 处理请求数据(修改或增加数据)
*
* @param action 行为
* @param data 数据
* @memberof MainService
*/
public handleRequestDataWithUpdate(action: string,context:any ={},data: any = {},isMerge:boolean = false){
let model: any = this.getMode();
if (!model && model.getDataItems instanceof Function) {
return data;
}
let dataItems: any[] = model.getDataItems();
let requestData:any = {};
if(isMerge && (data && data.viewparams)){
Object.assign(requestData,data.viewparams);
}
dataItems.forEach((item:any) =>{
if(item && item.dataType && Object.is(item.dataType,'FONTKEY')){
if(item && item.prop && item.name ){
requestData[item.prop] = context[item.name];
}
}else{
if(item && item.isEditable && item.prop && item.name && (data[item.name] || Object.is(data[item.name],0)) ){
requestData[item.prop] = data[item.name];
}
}
});
let tempContext:any = JSON.parse(JSON.stringify(context));
if(tempContext && tempContext.srfsessionid){
tempContext.srfsessionkey = tempContext.srfsessionid;
delete tempContext.srfsessionid;
}
return {context:tempContext,data:requestData};
}
}
\ No newline at end of file
ibzou-app/ibzou-app-web/src/main/resources/application-web-prod.yml
浏览文件 @ 354c2493
......@@ -9,47 +9,47 @@ zuul:
routes:
ibzdeptmember:
path: /ibzdeptmembers/**
serviceId: ibzou-api
serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
stripPrefix: false
ibzteammember:
path: /ibzteammembers/**
serviceId: ibzou-api
serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
stripPrefix: false
ibzdept:
path: /ibzdepartments/**
serviceId: ibzou-api
serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
stripPrefix: false
ibzemp:
path: /ibzemployees/**
serviceId: ibzou-api
serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
stripPrefix: false
ibzorg:
path: /ibzorganizations/**
serviceId: ibzou-api
serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
stripPrefix: false
ibzpost:
path: /ibzposts/**
serviceId: ibzou-api
serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
stripPrefix: false
ibzteam:
path: /ibzteams/**
serviceId: ibzou-api
serviceId: ${ibiz.ref.service.ibzou-api:ibzou-api}
stripPrefix: false
loginv7:
path: /v7/login
serviceId: ibzuaa-api
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false
changepwd:
path: /v7/changepwd
serviceId: ibzuaa-api
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false
uaa:
path: /uaa/**
serviceId: ibzuaa-api
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false
config:
path: /config/**
serviceId: ibzuaa-api
serviceId: ${ibiz.ref.service.uaa:ibzuaa-api}
stripPrefix: false
sensitive-headers:
- Cookie,Set-Cookie,Authorization
ibzou-app/ibzou-app-web/src/main/resources/application.yml
浏览文件 @ 354c2493
spring:
profiles:
include: sys , web-prod
include: sys ,nacos, web-prod
application:
name: ibzou-web
ibzou-boot/src/main/resources/application.yml
浏览文件 @ 354c2493
spring:
profiles:
include: sys , web-dev, api-dev, dev
include: sys ,nacos, web-dev, api-dev, dev
application:
name: ibzou
main:
......
ibzou-dependencies/pom.xml
浏览文件 @ 354c2493
......@@ -77,6 +77,9 @@
<!--baomidou-jobs定时服务 -->
<baomidou-jobs.version>1.0.3</baomidou-jobs.version>
<!-- eureka微服务注册中心 -->
<eureka-client.version>2.2.1.RELEASE</eureka-client.version>
<oracle.version>11.2.0.3</oracle.version>
<postgresql.version>42.2.6</postgresql.version>
......@@ -314,6 +317,13 @@
<artifactId>h2</artifactId>
</dependency>
<!-- eureka服务注册中心 -->
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
<version>${eureka-client.version}</version>
</dependency>
<!-- Oracle驱动包 -->
<dependency>
<groupId>com.oracle</groupId>
......@@ -332,6 +342,7 @@
<artifactId>mysql-connector-java</artifactId>
</dependency>
</dependencies>
</project>
ibzou-provider/ibzou-provider-api/src/main/resources/application.yml
浏览文件 @ 354c2493
spring:
profiles:
include: sys , api-prod
include: sys ,nacos, api-prod
application:
name: ibzou-api
\ No newline at end of file
ibzou-util/src/main/java/cn/ibizlab/util/client/IBZOUFeignClient.java
浏览文件 @ 354c2493
......@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.PathVariable;
import java.util.Map;
import java.util.Set;
@FeignClient(value = "ibzou-api",fallback = IBZOUFallback.class)
@FeignClient(value = "${ibiz.ref.service.ou:ibzou-api}",fallback = IBZOUFallback.class)
public interface IBZOUFeignClient
{
/**
......
ibzou-util/src/main/java/cn/ibizlab/util/client/IBZUAAFeignClient.java
浏览文件 @ 354c2493
......@@ -7,7 +7,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import com.alibaba.fastjson.JSONObject;
@FeignClient(value = "ibzuaa-api",fallback = IBZUAAFallback.class)
@FeignClient(value = "${ibiz.ref.service.uaa:ibzuaa-api}",fallback = IBZUAAFallback.class)
public interface IBZUAAFeignClient
{
/**
......
ibzou-util/src/main/java/cn/ibizlab/util/client/IBZWFFeignClient.java
浏览文件 @ 354c2493
......@@ -4,7 +4,7 @@ import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.*;
@FeignClient(value = "ibzwf-api",fallback = IBZWFFallback.class)
@FeignClient(value = "${ibiz.ref.service.wf:ibzwf-api}",fallback = IBZWFFallback.class)
public interface IBZWFFeignClient
{
@RequestMapping(method = RequestMethod.GET, value = "/{system}-app-{appname}/{entity}/process-definitions/{processDefinitionKey}/usertasks/{taskDefinitionKey}/tasks")
......
ibzou-util/src/main/resources/application-eureka.yml 0 → 100644
浏览文件 @ 354c2493
此差异已折叠。
ibzou-util/src/main/resources/application-nacos.yml 0 → 100644
浏览文件 @ 354c2493
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或