Skip to content
项目
群组
代码片段
帮助
正在加载...
帮助
提交反馈
为 GitLab 提交贡献
登录
切换导航
V
Vue_R6
项目
项目
详情
动态
版本
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
统计图
议题
4
议题
4
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
计划
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
Vue_V2
Vue_R6
提交
23a94ed0
提交
23a94ed0
编写于
12月 14, 2019
作者:
WodahsOrez
1
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
lxm---修复视图非路由方式打开后,内部路由跳转无效无提示的bug
上级
0b5285e9
变更
4
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
64 行增加
和
36 行删除
+64
-36
LOGIC.tsx.ftl
@LOGIC/@UIACTION/前台调用/LOGIC.tsx.ftl
+22
-14
LOGIC.tsx.ftl
@LOGIC/@VIEWLOGIC/新建/LOGIC.tsx.ftl
+12
-8
LOGIC.tsx.ftl
@LOGIC/@VIEWLOGIC/编辑/LOGIC.tsx.ftl
+22
-14
VIEW_HEADER.tsx.ftl
@VIEW/@MACRO/VIEW_HEADER.tsx.ftl
+8
-0
未找到文件。
@LOGIC/@UIACTION/前台调用/LOGIC.tsx.ftl
浏览文件 @
23a94ed0
...
@@ -129,13 +129,17 @@ ${front_block}
...
@@ -129,13 +129,17 @@ ${front_block}
delete data.srfparentdata;
delete data.srfparentdata;
}
}
const openIndexViewTab = (viewpath: string, data: any) => {
const openIndexViewTab = (viewpath: string, data: any) => {
const _params = this.$util.prepareRouteParmas({
if(this.isModal){
route: this.$route,
this.$Notice.error({ title: '错误', desc: '父视图是非路由方式打开,子视图无法进行路由跳转' });
sourceNode: this.$route.name,
}else{
targetNode: viewpath,
const _params = this.$util.prepareRouteParmas({
data: data,
route: this.$route,
});
sourceNode: this.$route.name,
this.$router.push({ name: viewpath, params: _params });
targetNode: viewpath,
data: data,
});
this.$router.push({ name: viewpath, params: _params });
}
resolve();
resolve();
}
}
<#-- 打开模态 -->
<#-- 打开模态 -->
...
@@ -302,13 +306,17 @@ ${front_block}
...
@@ -302,13 +306,17 @@ ${front_block}
delete data.srfparentdata;
delete data.srfparentdata;
}
}
const openIndexViewTab = (viewpath: string, data: any) => {
const openIndexViewTab = (viewpath: string, data: any) => {
const _params = this.$util.prepareRouteParmas({
if(this.isModal){
route: this.$route,
this.$Notice.error({ title: '错误', desc: '父视图是非路由方式打开,子视图无法进行路由跳转' });
sourceNode: this.$route.name,
}else{
targetNode: viewpath,
const _params = this.$util.prepareRouteParmas({
data: data,
route: this.$route,
});
sourceNode: this.$route.name,
this.$router.push({ name: viewpath, params: _params });
targetNode: viewpath,
data: data,
});
this.$router.push({ name: viewpath, params: _params });
}
resolve();
resolve();
}
}
openIndexViewTab('${frontview.getPSAppModule().codeName?lower_case}_${frontview.codeName?lower_case}', data);
openIndexViewTab('${frontview.getPSAppModule().codeName?lower_case}_${frontview.codeName?lower_case}', data);
...
...
@LOGIC/@VIEWLOGIC/新建/LOGIC.tsx.ftl
浏览文件 @
23a94ed0
...
@@ -64,14 +64,18 @@
...
@@ -64,14 +64,18 @@
Object.assign(data, _this.srfparentdata);
Object.assign(data, _this.srfparentdata);
}
}
const openIndexViewTab = (viewpath: string, data: any) => {
const openIndexViewTab = (viewpath: string, data: any) => {
Object.assign(data, { w: (new Date().getTime()) });
if(this.isModal){
const _params = this.$util.prepareRouteParmas({
this.$Notice.error({ title: '错误', desc: '父视图是非路由方式打开,子视图无法进行路由跳转' });
route: this.$route,
}else{
sourceNode: this.$route.name,
Object.assign(data, { w: (new Date().getTime()) });
targetNode: viewpath,
const _params = this.$util.prepareRouteParmas({
data: data,
route: this.$route,
});
sourceNode: this.$route.name,
this.$router.push({ name: viewpath, params: _params });
targetNode: viewpath,
data: data,
});
this.$router.push({ name: viewpath, params: _params });
}
}
}
openIndexViewTab('${dataview.getPSAppModule().codeName?lower_case}_${dataview.codeName?lower_case}', data);
openIndexViewTab('${dataview.getPSAppModule().codeName?lower_case}_${dataview.codeName?lower_case}', data);
<#elseif dataview.getOpenMode() = 'POPUPMODAL'>
<#elseif dataview.getOpenMode() = 'POPUPMODAL'>
...
...
@LOGIC/@VIEWLOGIC/编辑/LOGIC.tsx.ftl
浏览文件 @
23a94ed0
...
@@ -17,13 +17,17 @@
...
@@ -17,13 +17,17 @@
<#-- 打开顶级分页视图 -->
<#-- 打开顶级分页视图 -->
// 打开顶级分页视图
// 打开顶级分页视图
const openIndexViewTab = (viewpath: string, data: any) => {
const openIndexViewTab = (viewpath: string, data: any) => {
const _params = this.$util.prepareRouteParmas({
if(this.isModal){
route: this.$route,
this.$Notice.error({ title: '错误', desc: '父视图是非路由方式打开,子视图无法进行路由跳转' });
sourceNode: this.$route.name,
}else{
targetNode: viewpath,
const _params = this.$util.prepareRouteParmas({
data: data,
route: this.$route,
});
sourceNode: this.$route.name,
this.$router.push({ name: viewpath, params: _params });
targetNode: viewpath,
data: data,
});
this.$router.push({ name: viewpath, params: _params });
}
}
}
<#-- 打开模态 -->
<#-- 打开模态 -->
// 打开模态
// 打开模态
...
@@ -152,13 +156,17 @@
...
@@ -152,13 +156,17 @@
Object.assign(data, _this.srfparentdata);
Object.assign(data, _this.srfparentdata);
}
}
const openIndexViewTab = (viewpath: string, data: any) => {
const openIndexViewTab = (viewpath: string, data: any) => {
const _params = this.$util.prepareRouteParmas({
if(this.isModal){
route: this.$route,
this.$Notice.error({ title: '错误', desc: '父视图是非路由方式打开,子视图无法进行路由跳转' });
sourceNode: this.$route.name,
}else{
targetNode: viewpath,
const _params = this.$util.prepareRouteParmas({
data: data,
route: this.$route,
});
sourceNode: this.$route.name,
this.$router.push({ name: viewpath, params: _params });
targetNode: viewpath,
data: data,
});
this.$router.push({ name: viewpath, params: _params });
}
}
}
openIndexViewTab('${dataview.getPSAppModule().codeName?lower_case}_${dataview.codeName?lower_case}', data);
openIndexViewTab('${dataview.getPSAppModule().codeName?lower_case}_${dataview.codeName?lower_case}', data);
<#elseif dataview.getOpenMode() = 'POPUPMODAL'>
<#elseif dataview.getOpenMode() = 'POPUPMODAL'>
...
...
@VIEW/@MACRO/VIEW_HEADER.tsx.ftl
浏览文件 @
23a94ed0
...
@@ -62,6 +62,14 @@ export default class ${srfclassname('${view.name}')} extends Vue {
...
@@ -62,6 +62,14 @@ export default class ${srfclassname('${view.name}')} extends Vue {
*/
*/
@Prop() public viewdata!: string;
@Prop() public viewdata!: string;
/**
* 该视图是否为模态方式打开
*
* @type {boolean}
* @memberof ${srfclassname('${view.name}')}
*/
@Prop({default:false}) public isModal?:boolean;
/**
/**
* 视图标识
* 视图标识
*
*
...
...
lxm1993
@lxm1993
被提及 issue
#8 (closed)
·
12月 16, 2019
被提及 issue
#8 (closed)
被提及 issue #8
切换提交列表
编辑
预览
Markdown
格式
0%
请重试
or
添加新附件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
先完成此消息的编辑!
取消
想要评论请
注册
或
登录