Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
iBiz-Vue-Mob-R7
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
iBiz-R7前端标准模板
iBiz-Vue-Mob-R7
提交
d8fe836d
提交
d8fe836d
编写于
5月 28, 2020
作者:
KK
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "提示信息多语言"
This reverts commit
ea82783e
.
上级
ea82783e
变更
5
显示空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
16 行增加
和
25 行删除
+16
-25
CONTROL_HEADER-BASE.vue.ftl
@CONTROL/@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl
+0
-8
CONTROL-BASE.vue.ftl
@CONTROL/多编辑视图面板/CONTROL-BASE.vue.ftl
+2
-2
CONTROL-BASE.vue.ftl
@CONTROL/搜索表单/CONTROL-BASE.vue.ftl
+7
-7
CONTROL-BASE.vue.ftl
@CONTROL/表单/CONTROL-BASE.vue.ftl
+7
-7
CONTROL.html.ftl
@CONTROL/表单/CONTROL.html.ftl
+0
-1
未找到文件。
@CONTROL/@MACRO/CONTROL/CONTROL_HEADER-BASE.vue.ftl
浏览文件 @
d8fe836d
...
@@ -31,14 +31,6 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
...
@@ -31,14 +31,6 @@ export default class ${srfclassname('${ctrl.codeName}')}Base extends Vue impleme
*/
*/
@Prop() protected name?: string;
@Prop() protected name?: string;
/**
* 部件名称
*
* @type {string}
* @memberof ${srfclassname('${ctrl.codeName}')}
*/
@Prop() protected ctrlName?: string;
/**
/**
* 视图通讯对象
* 视图通讯对象
*
*
...
...
@CONTROL/多编辑视图面板/CONTROL-BASE.vue.ftl
浏览文件 @
d8fe836d
...
@@ -329,7 +329,7 @@ ${ctrl.render.code}
...
@@ -329,7 +329,7 @@ ${ctrl.render.code}
*/
*/
private load(data: any): void {
private load(data: any): void {
if(!this.fetchAction){
if(!this.fetchAction){
this.$notify({ type: 'danger', message: '${view.getName()}
'+this.$t('app.view')+this.ctrlName+'loaddraftAction'+ this.$t('app.notConfig')
);
this.$notify({ type: 'danger', message: '${view.getName()}
视图多编辑视图面板loaddraftAction参数未配置' }
);
return;
return;
}
}
let arg: any = {};
let arg: any = {};
...
@@ -364,7 +364,7 @@ ${ctrl.render.code}
...
@@ -364,7 +364,7 @@ ${ctrl.render.code}
*/
*/
protected handleAdd(){
protected handleAdd(){
if(!this.loaddraftAction){
if(!this.loaddraftAction){
this.$notify({ type: 'danger', message: '${view.getName()}
'+this.$t('app.view')+this.ctrlName+'loaddraftAction'+ this.$t('app.notConfig')
);
this.$notify({ type: 'danger', message: '${view.getName()}
视图多编辑视图面板loaddraftAction参数未配置' }
);
return;
return;
}
}
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);
...
...
@CONTROL/搜索表单/CONTROL-BASE.vue.ftl
浏览文件 @
d8fe836d
...
@@ -820,7 +820,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -820,7 +820,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*/
*/
private async load(opt: any = {}): Promise<any> {
private async load(opt: any = {}): Promise<any> {
if (!this.loadAction) {
if (!this.loadAction) {
this.$notice.error('${view.getName()}
'+this.$t('app.view')+this.ctrlName+'loadAction'+ this.$t('app.notConfig')
);
this.$notice.error('${view.getName()}
视图表单loadAction参数未配置'
);
return Promise.reject();
return Promise.reject();
}
}
const arg: any = { ...opt };
const arg: any = { ...opt };
...
@@ -848,7 +848,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -848,7 +848,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*/
*/
protected async loadDraft(opt: any = {}): Promise<any> {
protected async loadDraft(opt: any = {}): Promise<any> {
if (!this.loaddraftAction) {
if (!this.loaddraftAction) {
this.$notice.error('${view.getName()}
'+this.$t('app.view')+this.ctrlName+'loaddraftAction'+ this.$t('app.notConfig')
);
this.$notice.error('${view.getName()}
视图表单loaddraftAction参数未配置'
);
return Promise.reject();
return Promise.reject();
}
}
const arg: any = { ...opt } ;
const arg: any = { ...opt } ;
...
@@ -892,7 +892,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -892,7 +892,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if (!action) {
if (!action) {
let actionName: any = Object.is(data.srfuf, '1') ? "updateAction" : "createAction";
let actionName: any = Object.is(data.srfuf, '1') ? "updateAction" : "createAction";
this.$notice.error('${view.getName()}
'+this.$t('app.view')+this.ctrlName+actionName+ this.$t('app.notConfig')
);
this.$notice.error('${view.getName()}
视图表单' + actionName + '参数未配置'
);
return Promise.reject();
return Promise.reject();
}
}
Object.assign(arg, this.viewparams);
Object.assign(arg, this.viewparams);
...
@@ -955,7 +955,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -955,7 +955,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if (!action) {
if (!action) {
let actionName: any = Object.is(data.srfuf, '1') ? "updateAction" : "createAction";
let actionName: any = Object.is(data.srfuf, '1') ? "updateAction" : "createAction";
this.$notice.error('${view.getName()}
'+this.$t('app.view')+this.ctrlName+actionName+ this.$t('app.notConfig')
);
this.$notice.error('${view.getName()}
视图表单' + actionName + '参数未配置'
);
return Promise.reject();
return Promise.reject();
}
}
Object.assign(arg, this.viewparams);
Object.assign(arg, this.viewparams);
...
@@ -1004,7 +1004,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -1004,7 +1004,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*/
*/
private async remove(opt: Array<any> = [], showResultInfo?: boolean): Promise<any> {
private async remove(opt: Array<any> = [], showResultInfo?: boolean): Promise<any> {
if (!this.removeAction) {
if (!this.removeAction) {
this.$notice.error('${view.getName()}
'+this.$t('app.view')+this.ctrlName+'removeAction'+ this.$t('app.notConfig')
);
this.$notice.error('${view.getName()}
视图表单removeAction参数未配置'
);
return Promise.reject();
return Promise.reject();
}
}
const arg: any = opt[0];
const arg: any = opt[0];
...
@@ -1035,7 +1035,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -1035,7 +1035,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*/
*/
protected async wfstart(data: any): Promise<any> {
protected async wfstart(data: any): Promise<any> {
if (!this.WFStartAction) {
if (!this.WFStartAction) {
this.$notice.error('${view.getName()}
'+this.$t('app.view')+this.ctrlName+'WFStartAction'+ this.$t('app.notConfig')
);
this.$notice.error('${view.getName()}
视图表单WFStartAction参数未配置'
);
return Promise.reject();
return Promise.reject();
}
}
const _this: any = this;
const _this: any = this;
...
@@ -1060,7 +1060,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -1060,7 +1060,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*/
*/
protected async wfsubmit(data: any): Promise<any> {
protected async wfsubmit(data: any): Promise<any> {
if (!this.WFSubmitAction) {
if (!this.WFSubmitAction) {
this.$notice.error('${view.getName()}
'+this.$t('app.view')+this.ctrlName+'WFSubmitAction'+ this.$t('app.notConfig')
);
this.$notice.error('${view.getName()}
视图表单WFSubmitAction参数未配置'
);
return Promise.reject();
return Promise.reject();
}
}
const _this: any = this;
const _this: any = this;
...
...
@CONTROL/表单/CONTROL-BASE.vue.ftl
浏览文件 @
d8fe836d
...
@@ -820,7 +820,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -820,7 +820,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*/
*/
private async load(opt: any = {}): Promise<any> {
private async load(opt: any = {}): Promise<any> {
if (!this.loadAction) {
if (!this.loadAction) {
this.$notice.error('${view.getName()}
'+this.$t('app.view')+this.ctrlName+'loadAction'+ this.$t('app.notConfig')
);
this.$notice.error('${view.getName()}
视图表单loadAction参数未配置'
);
return Promise.reject();
return Promise.reject();
}
}
const arg: any = { ...opt };
const arg: any = { ...opt };
...
@@ -848,7 +848,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -848,7 +848,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*/
*/
protected async loadDraft(opt: any = {}): Promise<any> {
protected async loadDraft(opt: any = {}): Promise<any> {
if (!this.loaddraftAction) {
if (!this.loaddraftAction) {
this.$notice.error('${view.getName()}
'+this.$t('app.view')+this.ctrlName+'loaddraftAction'+ this.$t('app.notConfig')
);
this.$notice.error('${view.getName()}
视图表单loaddraftAction参数未配置'
);
return Promise.reject();
return Promise.reject();
}
}
const arg: any = { ...opt } ;
const arg: any = { ...opt } ;
...
@@ -892,7 +892,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -892,7 +892,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if (!action) {
if (!action) {
let actionName: any = Object.is(data.srfuf, '1') ? "updateAction" : "createAction";
let actionName: any = Object.is(data.srfuf, '1') ? "updateAction" : "createAction";
this.$notice.error('${view.getName()}
'+this.$t('app.view')+this.ctrlName+actionName+ this.$t('app.notConfig')
);
this.$notice.error('${view.getName()}
视图表单' + actionName + '参数未配置'
);
return Promise.reject();
return Promise.reject();
}
}
Object.assign(arg, this.viewparams);
Object.assign(arg, this.viewparams);
...
@@ -955,7 +955,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -955,7 +955,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
const action: any = Object.is(data.srfuf, '1') ? this.updateAction : this.createAction;
if (!action) {
if (!action) {
let actionName: any = Object.is(data.srfuf, '1') ? "updateAction" : "createAction";
let actionName: any = Object.is(data.srfuf, '1') ? "updateAction" : "createAction";
this.$notice.error('${view.getName()}
'+this.$t('app.view')+this.ctrlName+actionName+ this.$t('app.notConfig')
);
this.$notice.error('${view.getName()}
视图表单' + actionName + '参数未配置'
);
return Promise.reject();
return Promise.reject();
}
}
Object.assign(arg, this.viewparams);
Object.assign(arg, this.viewparams);
...
@@ -1004,7 +1004,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -1004,7 +1004,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*/
*/
private async remove(opt: Array<any> = [], showResultInfo?: boolean): Promise<any> {
private async remove(opt: Array<any> = [], showResultInfo?: boolean): Promise<any> {
if (!this.removeAction) {
if (!this.removeAction) {
this.$notice.error('${view.getName()}
'+this.$t('app.view')+this.ctrlName+'removeAction'+ this.$t('app.notConfig')
);
this.$notice.error('${view.getName()}
视图表单removeAction参数未配置'
);
return Promise.reject();
return Promise.reject();
}
}
const arg: any = opt[0];
const arg: any = opt[0];
...
@@ -1035,7 +1035,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -1035,7 +1035,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*/
*/
protected async wfstart(data: any): Promise<any> {
protected async wfstart(data: any): Promise<any> {
if (!this.WFStartAction) {
if (!this.WFStartAction) {
this.$notice.error('${view.getName()}
'+this.$t('app.view')+this.ctrlName+'WFStartAction'+ this.$t('app.notConfig')
);
this.$notice.error('${view.getName()}
视图表单WFStartAction参数未配置'
);
return Promise.reject();
return Promise.reject();
}
}
const _this: any = this;
const _this: any = this;
...
@@ -1060,7 +1060,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
...
@@ -1060,7 +1060,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
*/
*/
protected async wfsubmit(data: any): Promise<any> {
protected async wfsubmit(data: any): Promise<any> {
if (!this.WFSubmitAction) {
if (!this.WFSubmitAction) {
this.$notice.error('${view.getName()}
'+this.$t('app.view')+this.ctrlName+'WFSubmitAction'+ this.$t('app.notConfig')
);
this.$notice.error('${view.getName()}
视图表单WFSubmitAction参数未配置'
);
return Promise.reject();
return Promise.reject();
}
}
const _this: any = this;
const _this: any = this;
...
...
@CONTROL/表单/CONTROL.html.ftl
浏览文件 @
d8fe836d
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
<#assign content>
<#assign content>
<#if ctrl.isEnableAutoSave??>:autosave="${ctrl.isEnableAutoSave()?c}"</#if>
<#if ctrl.isEnableAutoSave??>:autosave="${ctrl.isEnableAutoSave()?c}"</#if>
:viewtag="viewtag"
:viewtag="viewtag"
:ctrlName="$t('app.ctrl.from')"
:showBusyIndicator="${ctrl.isShowBusyIndicator()?c}"
:showBusyIndicator="${ctrl.isShowBusyIndicator()?c}"
updateAction="<#if ctrl.getUpdatePSControlAction ?? && ctrl.getUpdatePSControlAction()?? && ctrl.getUpdatePSControlAction().getPSAppDEMethod()??>${ctrl.getUpdatePSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
updateAction="<#if ctrl.getUpdatePSControlAction ?? && ctrl.getUpdatePSControlAction()?? && ctrl.getUpdatePSControlAction().getPSAppDEMethod()??>${ctrl.getUpdatePSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
removeAction="<#if ctrl.getRemovePSControlAction ?? && ctrl.getRemovePSControlAction()?? && ctrl.getRemovePSControlAction().getPSAppDEMethod()??>${ctrl.getRemovePSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
removeAction="<#if ctrl.getRemovePSControlAction ?? && ctrl.getRemovePSControlAction()?? && ctrl.getRemovePSControlAction().getPSAppDEMethod()??>${ctrl.getRemovePSControlAction().getPSAppDEMethod().getCodeName()}</#if>"
...
...
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录