Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
iBiz-Vue-R7
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
22
议题
22
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz-R7前端标准模板
iBiz-Vue-R7
提交
b069eab9
提交
b069eab9
编写于
4月 20, 2021
作者:
Mosher
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
调整错误提示信息
上级
cb19db08
变更
9
显示空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
43 行增加
和
43 行删除
+43
-43
CONTROL-BASE.vue.ftl
@CONTROL/列表/CONTROL-BASE.vue.ftl
+3
-3
CONTROL-BASE.vue.ftl
@CONTROL/多编辑视图面板/CONTROL-BASE.vue.ftl
+6
-6
CONTROL-BASE.vue.ftl
@CONTROL/搜索表单/CONTROL-BASE.vue.ftl
+2
-2
CONTROL-BASE.vue.ftl
@CONTROL/数据视图/CONTROL-BASE.vue.ftl
+3
-3
CONTROL-BASE.vue.ftl
@CONTROL/日历部件/CONTROL-BASE.vue.ftl
+6
-6
CONTROL-BASE.vue.ftl
@CONTROL/看板视图/CONTROL-BASE.vue.ftl
+3
-3
CONTROL-BASE.vue.ftl
@CONTROL/表格/CONTROL-BASE.vue.ftl
+9
-9
CONTROL-BASE.vue.ftl
@CONTROL/表格(透视表)/CONTROL-BASE.vue.ftl
+8
-8
WF_VIEW_CONTENT.vue.ftl
@VIEW/@MACRO/WF_VIEW_CONTENT.vue.ftl
+3
-3
未找到文件。
@CONTROL/列表/CONTROL-BASE.vue.ftl
浏览文件 @
b069eab9
...
@@ -671,8 +671,8 @@ import CodeListService from "@/codelist/codelist-service";
...
@@ -671,8 +671,8 @@ import CodeListService from "@/codelist/codelist-service";
const post: Promise<any> = this.service.search(this.fetchAction, this.context?JSON.parse(JSON.stringify(this.context)):{}, arg, this.showBusyIndicator);
const post: Promise<any> = this.service.search(this.fetchAction, this.context?JSON.parse(JSON.stringify(this.context)):{}, arg, this.showBusyIndicator);
post.then((response: any) => {
post.then((response: any) => {
if (!response || response.status !== 200) {
if (!response || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorM
essage });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data.m
essage });
}
}
return;
return;
}
}
...
@@ -714,7 +714,7 @@ import CodeListService from "@/codelist/codelist-service";
...
@@ -714,7 +714,7 @@ import CodeListService from "@/codelist/codelist-service";
if (response && response.status === 401) {
if (response && response.status === 401) {
return;
return;
}
}
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorMessage
});
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data && response.data.message ? response.data.message : ""
});
});
});
}
}
...
...
@CONTROL/多编辑视图面板/CONTROL-BASE.vue.ftl
浏览文件 @
b069eab9
...
@@ -355,8 +355,8 @@
...
@@ -355,8 +355,8 @@
const promice: Promise<any> = this.service.get(this.fetchAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
const promice: Promise<any> = this.service.get(this.fetchAction,JSON.parse(JSON.stringify(this.context)),arg, this.showBusyIndicator);
promice.then((response: any) => {
promice.then((response: any) => {
if (!response.status || response.status !== 200) {
if (!response.status || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorM
essage });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data.m
essage });
}
}
return;
return;
}
}
...
@@ -370,7 +370,7 @@
...
@@ -370,7 +370,7 @@
if (response && response.status === 401) {
if (response && response.status === 401) {
return;
return;
}
}
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorMessage
});
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data && response.data.message ? response.data.message : ""
});
});
});
}
}
...
@@ -387,8 +387,8 @@
...
@@ -387,8 +387,8 @@
const promice: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)),{viewparams:this.viewparams}, this.showBusyIndicator);
const promice: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)),{viewparams:this.viewparams}, this.showBusyIndicator);
promice.then((response: any) => {
promice.then((response: any) => {
if (!response.status || response.status !== 200) {
if (!response.status || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorM
essage });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data.m
essage });
}
}
return;
return;
}
}
...
@@ -398,7 +398,7 @@
...
@@ -398,7 +398,7 @@
if (response && response.status === 401) {
if (response && response.status === 401) {
return;
return;
}
}
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorMessage
});
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data && response.data.message ? response.data.message : ""
});
});
});
}
}
...
...
@CONTROL/搜索表单/CONTROL-BASE.vue.ftl
浏览文件 @
b069eab9
...
@@ -699,8 +699,8 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -699,8 +699,8 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
let post: Promise<any> = this.service.loadDraft(this.loaddraftAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
post.then((response: any) => {
post.then((response: any) => {
if (!response.status || response.status !== 200) {
if (!response.status || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorM
essage });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data.m
essage });
}
}
return;
return;
}
}
...
...
@CONTROL/数据视图/CONTROL-BASE.vue.ftl
浏览文件 @
b069eab9
...
@@ -831,8 +831,8 @@ import CodeListService from "@/codelist/codelist-service";
...
@@ -831,8 +831,8 @@ import CodeListService from "@/codelist/codelist-service";
const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
post.then((response: any) => {
post.then((response: any) => {
if (!response || response.status !== 200) {
if (!response || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorM
essage });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data.m
essage });
}
}
return;
return;
}
}
...
@@ -877,7 +877,7 @@ import CodeListService from "@/codelist/codelist-service";
...
@@ -877,7 +877,7 @@ import CodeListService from "@/codelist/codelist-service";
if (response && response.status === 401) {
if (response && response.status === 401) {
return;
return;
}
}
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorMessage
});
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data && response.data.message ? response.data.message : ""
});
});
});
}
}
...
...
@CONTROL/日历部件/CONTROL-BASE.vue.ftl
浏览文件 @
b069eab9
...
@@ -496,8 +496,8 @@ FullCalendar,
...
@@ -496,8 +496,8 @@ FullCalendar,
const post: Promise<any> = this.service.search(this.loadAction, JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
const post: Promise<any> = this.service.search(this.loadAction, JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
post.then((response: any) => {
post.then((response: any) => {
if (!response || response.status !== 200) {
if (!response || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorM
essage });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data.m
essage });
}
}
return;
return;
}
}
...
@@ -508,7 +508,7 @@ FullCalendar,
...
@@ -508,7 +508,7 @@ FullCalendar,
if (response && response.status === 401) {
if (response && response.status === 401) {
return;
return;
}
}
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorMessage
});
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data && response.data.message ? response.data.message : ""
});
});
});
}
}
...
@@ -698,8 +698,8 @@ FullCalendar,
...
@@ -698,8 +698,8 @@ FullCalendar,
const post: Promise<any> = this.service.update(itemType, JSON.parse(JSON.stringify(_context)), arg, this.showBusyIndicator);
const post: Promise<any> = this.service.update(itemType, JSON.parse(JSON.stringify(_context)), arg, this.showBusyIndicator);
post.then((response: any) => {
post.then((response: any) => {
if (!response || response.status !== 200) {
if (!response || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorM
essage });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data.m
essage });
}
}
return;
return;
}
}
...
@@ -707,7 +707,7 @@ FullCalendar,
...
@@ -707,7 +707,7 @@ FullCalendar,
if (response && response.status === 401) {
if (response && response.status === 401) {
return;
return;
}
}
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorMessage
});
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data && response.data.message ? response.data.message : ""
});
});
});
}
}
...
...
@CONTROL/看板视图/CONTROL-BASE.vue.ftl
浏览文件 @
b069eab9
...
@@ -467,8 +467,8 @@ draggable,
...
@@ -467,8 +467,8 @@ draggable,
const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
post.then((response: any) => {
post.then((response: any) => {
if (!response || response.status !== 200) {
if (!response || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorM
essage });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data.m
essage });
}
}
return;
return;
}
}
...
@@ -498,7 +498,7 @@ draggable,
...
@@ -498,7 +498,7 @@ draggable,
if (response && response.status === 401) {
if (response && response.status === 401) {
return;
return;
}
}
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorMessage
});
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data && response.data.message ? response.data.message : ""
});
});
});
}
}
...
...
@CONTROL/表格/CONTROL-BASE.vue.ftl
浏览文件 @
b069eab9
...
@@ -828,8 +828,8 @@ ${gridColumn.getName()}
...
@@ -828,8 +828,8 @@ ${gridColumn.getName()}
const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
post.then((response: any) => {
post.then((response: any) => {
if (!response.status || response.status !== 200) {
if (!response.status || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorM
essage });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data.m
essage });
}
}
return;
return;
}
}
...
@@ -885,7 +885,7 @@ ${gridColumn.getName()}
...
@@ -885,7 +885,7 @@ ${gridColumn.getName()}
if (response && response.status === 401) {
if (response && response.status === 401) {
return;
return;
}
}
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorMessage
});
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data && response.data.message ? response.data.message : ""
});
});
});
}
}
...
@@ -970,7 +970,7 @@ ${gridColumn.getName()}
...
@@ -970,7 +970,7 @@ ${gridColumn.getName()}
resolve(response);
resolve(response);
}).catch((response: any) => {
}).catch((response: any) => {
if (response && response.status != 200) {
if (response && response.status != 200) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
message
});
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data && response.data.message ? response.data.message : ""
});
return;
return;
}
}
if (!response || !response.status || !response.data) {
if (!response || !response.status || !response.data) {
...
@@ -2086,8 +2086,8 @@ ${gridColumn.getName()}
...
@@ -2086,8 +2086,8 @@ ${gridColumn.getName()}
public getAggData(){
public getAggData(){
this.service.getAggData(this.aggAction,JSON.parse(JSON.stringify(this.context)),this.showBusyIndicator).then((response:any) =>{
this.service.getAggData(this.aggAction,JSON.parse(JSON.stringify(this.context)),this.showBusyIndicator).then((response:any) =>{
if (!response.status || response.status !== 200) {
if (!response.status || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorM
essage });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data.m
essage });
}
}
return;
return;
}
}
...
@@ -2099,7 +2099,7 @@ ${gridColumn.getName()}
...
@@ -2099,7 +2099,7 @@ ${gridColumn.getName()}
}
}
this.remoteData = {};
this.remoteData = {};
this.isDisplay = true;
this.isDisplay = true;
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorMessage
});
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data && response.data.message ? response.data.message : ""
});
})
})
}
}
</#if>
</#if>
...
@@ -2322,8 +2322,8 @@ ${gridColumn.getName()}
...
@@ -2322,8 +2322,8 @@ ${gridColumn.getName()}
let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
post.then((response: any) => {
post.then((response: any) => {
if (!response.status || response.status !== 200) {
if (!response.status || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
errorM
essage });
this.$Notice.error({ title: (this.$t('app.commonWords.wrong') as string), desc: response.
data.m
essage });
}
}
return;
return;
}
}
...
...
@CONTROL/表格(透视表)/CONTROL-BASE.vue.ftl
浏览文件 @
b069eab9
...
@@ -643,8 +643,8 @@ import { FormItemModel } from '@/model/form-detail';
...
@@ -643,8 +643,8 @@ import { FormItemModel } from '@/model/form-detail';
const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
const post: Promise<any> = this.service.search(this.fetchAction,JSON.parse(JSON.stringify(this.context)), arg, this.showBusyIndicator);
post.then((response: any) => {
post.then((response: any) => {
if (!response.status || response.status !== 200) {
if (!response.status || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: '错误', desc: response.
errorM
essage });
this.$Notice.error({ title: '错误', desc: response.
data.m
essage });
}
}
return;
return;
}
}
...
@@ -684,7 +684,7 @@ import { FormItemModel } from '@/model/form-detail';
...
@@ -684,7 +684,7 @@ import { FormItemModel } from '@/model/form-detail';
if (response && response.status === 401) {
if (response && response.status === 401) {
return;
return;
}
}
this.$Notice.error({ title: '错误', desc: response.
errorMessage
});
this.$Notice.error({ title: '错误', desc: response.
data && response.data.message ? response.data.message : ""
});
});
});
}
}
...
@@ -1486,8 +1486,8 @@ import { FormItemModel } from '@/model/form-detail';
...
@@ -1486,8 +1486,8 @@ import { FormItemModel } from '@/model/form-detail';
public getAggData(){
public getAggData(){
this.service.getAggData(this.aggAction,JSON.parse(JSON.stringify(this.context)),this.showBusyIndicator).then((response:any) =>{
this.service.getAggData(this.aggAction,JSON.parse(JSON.stringify(this.context)),this.showBusyIndicator).then((response:any) =>{
if (!response.status || response.status !== 200) {
if (!response.status || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: '错误', desc: response.
errorMessage
});
this.$Notice.error({ title: '错误', desc: response.
data && response.data.message ? response.data.message : ""
});
}
}
return;
return;
}
}
...
@@ -1499,7 +1499,7 @@ import { FormItemModel } from '@/model/form-detail';
...
@@ -1499,7 +1499,7 @@ import { FormItemModel } from '@/model/form-detail';
}
}
this.remoteData = {};
this.remoteData = {};
this.isDisplay = true;
this.isDisplay = true;
this.$Notice.error({ title: '错误', desc: response.
errorMessage
});
this.$Notice.error({ title: '错误', desc: response.
data && response.data.message ? response.data.message : ""
});
})
})
}
}
</#if>
</#if>
...
@@ -1655,8 +1655,8 @@ import { FormItemModel } from '@/model/form-detail';
...
@@ -1655,8 +1655,8 @@ import { FormItemModel } from '@/model/form-detail';
let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
let post: Promise<any> = this.service.loadDraft(this.loaddraftAction, JSON.parse(JSON.stringify(this.context)), args[0], this.showBusyIndicator);
post.then((response: any) => {
post.then((response: any) => {
if (!response.status || response.status !== 200) {
if (!response.status || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: '错误', desc: response.
errorM
essage });
this.$Notice.error({ title: '错误', desc: response.
data.m
essage });
}
}
return;
return;
}
}
...
...
@VIEW/@MACRO/WF_VIEW_CONTENT.vue.ftl
浏览文件 @
b069eab9
...
@@ -104,8 +104,8 @@
...
@@ -104,8 +104,8 @@
const _this: any = this;
const _this: any = this;
this.wf_Step(item, $event, data).then((response: any) => {
this.wf_Step(item, $event, data).then((response: any) => {
if (!response.status || response.status !== 200) {
if (!response.status || response.status !== 200) {
if (response.
errorM
essage) {
if (response.
data && response.data.m
essage) {
this.$Notice.error({ title: '错误', desc: response.
errorM
essage });
this.$Notice.error({ title: '错误', desc: response.
data.m
essage });
}
}
return;
return;
}
}
...
@@ -122,7 +122,7 @@
...
@@ -122,7 +122,7 @@
if (response && response.status === 401) {
if (response && response.status === 401) {
return;
return;
}
}
this.$Notice.error({ title: '错误', desc: response.
errorMessage
});
this.$Notice.error({ title: '错误', desc: response.
data && response.data.message ? response.data.message : ""
});
});
});
}
}
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录