提交 961687b4 编写于 作者: ibizdev's avatar ibizdev

hebao1234 发布系统代码 [ibz-lite,应用]

上级 e3c61b74
......@@ -39,6 +39,14 @@
"viewname": "MetaModelGridView",
"viewtag": "18d59a3ac7947d7123e0be76e7cb71c0"
},
"bladevisualgridview": {
"title": "大屏展示表格视图",
"caption": "可视化表",
"viewtype": "DEGRIDVIEW",
"viewmodule": "avuedata",
"viewname": "BladeVisualGridView",
"viewtag": "1acb538e571dd5728a1ac2a7248304db"
},
"dstappgridview": {
"title": "应用表格视图",
"caption": "应用",
......@@ -287,6 +295,14 @@
"viewname": "DstSystemEditView",
"viewtag": "a74ac9914f18ea5f417e041085f19c7f"
},
"bladevisualeditview": {
"title": "大屏展示编辑视图",
"caption": "可视化表",
"viewtype": "DEEDITVIEW",
"viewmodule": "avuedata",
"viewname": "BladeVisualEditView",
"viewtag": "ae17e402fbd7acdc83dcb52139cfffe2"
},
"metamoduleeditview": {
"title": "模块编辑视图",
"caption": "模块",
......
......@@ -98,6 +98,7 @@ import AppAlert from './components/app-alert/app-alert.vue'
import AppAlertGroup from './components/app-alert-group/app-alert-group.vue'
import AppRawItem from './components/app-rawitem/app-rawitem.vue'
import AppImageRomate from './components/app-image-romate/app-image-romate.vue'
import { MenuIcon } from './components/menu-icon/menu-icon'
// 全局挂载UI实体服务注册中心
window['uiServiceRegister'] = uiServiceRegister;
......@@ -210,6 +211,7 @@ export const AppComponents = {
v.component('app-alert', AppAlert);
v.component('app-alert-group', AppAlertGroup);
v.component('app-rawitem',AppRawItem);
v.component('app-image-romate', AppImageRomate)
v.component('app-image-romate', AppImageRomate);
v.component('menu-icon', MenuIcon);
},
};
\ No newline at end of file
......@@ -53,6 +53,7 @@ export class AuthServiceRegister {
this.allAuthService.set('dstdatasource', () => import('@/authservice/dst-data-source/dst-data-source-auth-service'));
this.allAuthService.set('dstsystem', () => import('@/authservice/dst-system/dst-system-auth-service'));
this.allAuthService.set('metarelationship', () => import('@/authservice/meta-relationship/meta-relationship-auth-service'));
this.allAuthService.set('bladevisual', () => import('@/authservice/blade-visual/blade-visual-auth-service'));
this.allAuthService.set('metaentity', () => import('@/authservice/meta-entity/meta-entity-auth-service'));
}
......
import AuthService from '../auth-service';
/**
* 可视化表权限服务对象基类
*
* @export
* @class BladeVisualAuthServiceBase
* @extends {AuthService}
*/
export default class BladeVisualAuthServiceBase extends AuthService {
/**
* Creates an instance of BladeVisualAuthServiceBase.
*
* @param {*} [opts={}]
* @memberof BladeVisualAuthServiceBase
*/
constructor(opts: any = {}) {
super(opts);
}
/**
* 根据当前数据获取实体操作标识
*
* @param {*} mainSateOPPrivs 传入数据操作标识
* @returns {any}
* @memberof BladeVisualAuthServiceBase
*/
public getOPPrivs(mainSateOPPrivs:any):any{
let curDefaultOPPrivs:any = this.getSysOPPrivs();
let copyDefaultOPPrivs:any = JSON.parse(JSON.stringify(curDefaultOPPrivs));
if(mainSateOPPrivs){
Object.assign(curDefaultOPPrivs,mainSateOPPrivs);
}
// 统一资源优先
Object.keys(curDefaultOPPrivs).forEach((name:string) => {
if(this.sysOPPrivsMap.get(name) && copyDefaultOPPrivs[name] === 0){
curDefaultOPPrivs[name] = copyDefaultOPPrivs[name];
}
});
return curDefaultOPPrivs;
}
}
\ No newline at end of file
import BladeVisualAuthServiceBase from './blade-visual-auth-service-base';
/**
* 可视化表权限服务对象
*
* @export
* @class BladeVisualAuthService
* @extends {BladeVisualAuthServiceBase}
*/
export default class BladeVisualAuthService extends BladeVisualAuthServiceBase {
/**
* Creates an instance of BladeVisualAuthService.
*
* @param {*} [opts={}]
* @memberof BladeVisualAuthService
*/
constructor(opts: any = {}) {
super(opts);
}
}
\ No newline at end of file
......@@ -341,6 +341,7 @@ export default class AppPicker extends Vue {
public onSelectOpen(flag: boolean): void {
this.open = flag;
if (this.open) {
this.items = [];
//设置下拉列表的最大宽度
this.setDropdownWidth();
this.onSearch(this.curvalue, null, true);
......
import { Vue, Component, Prop } from 'vue-property-decorator';
import './menu-icon.less';
/**
* 平台菜单按钮适配
*
* @export
* @class MenuIcon
* @extends {Vue}
*/
@Component({})
export class MenuIcon extends Vue {
/**
* 项数据
*
* @type {*}
* @memberof MenuIcon
*/
@Prop()
public item: any;
/**
* 绘制图标
*
* @returns {*}
* @memberof MenuIcon
*/
public render(): any {
if (this.item) {
if (this.item.iconcls) {
return <i class={this.item.iconcls} />
}
if (this.item.icon) {
return <img src={this.item.icon} />
}
}
return <span />
}
}
\ No newline at end of file
......@@ -97,6 +97,15 @@ export class SearchViewEngine extends ViewEngine {
if (this.view && !this.view.isExpandSearchForm) {
Object.assign(arg, { query: this.view.query });
}
// 快速分组和快速搜索栏
let otherQueryParam:any = {};
if(this.view && this.view.quickGroupData){
Object.assign(otherQueryParam,this.view.quickGroupData);
}
if(this.view && this.view.quickFormData){
Object.assign(otherQueryParam,this.view.quickFormData);
}
Object.assign(arg,{viewparams:otherQueryParam});
}
......
......@@ -12,6 +12,7 @@ import metamodule_en_US from '@locale/lanres/entities/meta-module/meta-module_en
import dstdatasource_en_US from '@locale/lanres/entities/dst-data-source/dst-data-source_en_US';
import dstsystem_en_US from '@locale/lanres/entities/dst-system/dst-system_en_US';
import metarelationship_en_US from '@locale/lanres/entities/meta-relationship/meta-relationship_en_US';
import bladevisual_en_US from '@locale/lanres/entities/blade-visual/blade-visual_en_US';
import metaentity_en_US from '@locale/lanres/entities/meta-entity/meta-entity_en_US';
import components_en_US from '@locale/lanres/components/components_en_US';
import codelist_en_US from '@locale/lanres/codelist/codelist_en_US';
......@@ -147,6 +148,7 @@ export default {
menuitem7: "路由",
menuitem3: "视图",
menuitem4: "组件",
menuitem10: "大屏",
},
},
formpage:{
......@@ -254,6 +256,7 @@ export default {
dstdatasource: dstdatasource_en_US,
dstsystem: dstsystem_en_US,
metarelationship: metarelationship_en_US,
bladevisual: bladevisual_en_US,
metaentity: metaentity_en_US,
},
components: components_en_US,
......
......@@ -12,6 +12,7 @@ import metamodule_zh_CN from '@locale/lanres/entities/meta-module/meta-module_zh
import dstdatasource_zh_CN from '@locale/lanres/entities/dst-data-source/dst-data-source_zh_CN';
import dstsystem_zh_CN from '@locale/lanres/entities/dst-system/dst-system_zh_CN';
import metarelationship_zh_CN from '@locale/lanres/entities/meta-relationship/meta-relationship_zh_CN';
import bladevisual_zh_CN from '@locale/lanres/entities/blade-visual/blade-visual_zh_CN';
import metaentity_zh_CN from '@locale/lanres/entities/meta-entity/meta-entity_zh_CN';
import components_zh_CN from '@locale/lanres/components/components_zh_CN';
import codelist_zh_CN from '@locale/lanres/codelist/codelist_zh_CN';
......@@ -147,6 +148,7 @@ export default {
menuitem7: "路由",
menuitem3: "视图",
menuitem4: "组件",
menuitem10: "大屏",
},
},
formpage:{
......@@ -253,6 +255,7 @@ export default {
dstdatasource: dstdatasource_zh_CN,
dstsystem: dstsystem_zh_CN,
metarelationship: metarelationship_zh_CN,
bladevisual: bladevisual_zh_CN,
metaentity: metaentity_zh_CN,
},
components: components_zh_CN,
......
export default {
fields: {
id: "主键",
title: "大屏标题",
backgroundurl: "大屏背景",
category: "大屏类型",
password: "发布密码",
createuser: "创建人",
createdept: "创建部门",
createtime: "创建时间",
updateuser: "修改人",
updatetime: "修改时间",
status: "状态",
isdeleted: "是否已删除",
},
views: {
gridview: {
caption: "可视化表",
title: "大屏展示表格视图",
},
editview: {
caption: "可视化表",
title: "大屏展示编辑视图",
},
},
main_form: {
details: {
group1: "大屏展示基本信息",
formpage1: "基本信息",
srfupdatedate: "修改时间",
srforikey: "",
srfkey: "主键",
srfmajortext: "大屏标题",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
title: "大屏标题",
category: "大屏类型",
status: "状态",
background_url: "大屏背景",
id: "主键",
},
uiactions: {
},
},
main_grid: {
columns: {
title: "大屏标题",
category: "大屏类型",
status: "状态",
update_time: "修改时间",
},
nodata:"",
uiactions: {
},
},
default_searchform: {
details: {
formpage1: "常规条件",
},
uiactions: {
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "New",
tip: "New",
},
tbitem4: {
caption: "Edit",
tip: "Edit {0}",
},
tbitem6: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "Remove",
tip: "Remove {0}",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "Export",
tip: "Export {0} Data To Excel",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem16: {
caption: "其它",
tip: "其它",
},
tbitem21: {
caption: "Export Data Model",
tip: "导出数据模型",
},
tbitem23: {
caption: "数据导入",
tip: "数据导入",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "Filter",
tip: "Filter",
},
tbitem18: {
caption: "Help",
tip: "Help",
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: "Save",
tip: "Save",
},
tbitem6: {
caption: "-",
tip: "",
},
tbitem7: {
caption: "Remove And Close",
tip: "Remove And Close Window",
},
tbitem8: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "New",
tip: "New",
},
tbitem13: {
caption: "-",
tip: "",
},
tbitem14: {
caption: "Copy",
tip: "Copy {0}",
},
tbitem16: {
caption: "-",
tip: "",
},
tbitem18: {
caption: "其它",
tip: "其它",
},
tbitem5: {
caption: "Save And Close",
tip: "Save And Close Window",
},
tbitem4: {
caption: "Save And New",
tip: "Save And New",
},
tbitem23: {
caption: "第一个记录",
tip: "第一个记录",
},
tbitem24: {
caption: "上一个记录",
tip: "上一个记录",
},
tbitem25: {
caption: "下一个记录",
tip: "下一个记录",
},
tbitem26: {
caption: "最后一个记录",
tip: "最后一个记录",
},
tbitem22: {
caption: "Help",
tip: "Help",
},
},
};
\ No newline at end of file
export default {
fields: {
id: "主键",
title: "大屏标题",
backgroundurl: "大屏背景",
category: "大屏类型",
password: "发布密码",
createuser: "创建人",
createdept: "创建部门",
createtime: "创建时间",
updateuser: "修改人",
updatetime: "修改时间",
status: "状态",
isdeleted: "是否已删除",
},
views: {
gridview: {
caption: "可视化表",
title: "大屏展示表格视图",
},
editview: {
caption: "可视化表",
title: "大屏展示编辑视图",
},
},
main_form: {
details: {
group1: "大屏展示基本信息",
formpage1: "基本信息",
srfupdatedate: "修改时间",
srforikey: "",
srfkey: "主键",
srfmajortext: "大屏标题",
srftempmode: "",
srfuf: "",
srfdeid: "",
srfsourcekey: "",
title: "大屏标题",
category: "大屏类型",
status: "状态",
background_url: "大屏背景",
id: "主键",
},
uiactions: {
},
},
main_grid: {
columns: {
title: "大屏标题",
category: "大屏类型",
status: "状态",
update_time: "修改时间",
},
nodata:"",
uiactions: {
},
},
default_searchform: {
details: {
formpage1: "常规条件",
},
uiactions: {
},
},
gridviewtoolbar_toolbar: {
tbitem3: {
caption: "新建",
tip: "新建",
},
tbitem4: {
caption: "编辑",
tip: "编辑",
},
tbitem6: {
caption: "拷贝",
tip: "拷贝",
},
tbitem7: {
caption: "-",
tip: "",
},
tbitem8: {
caption: "删除",
tip: "删除",
},
tbitem9: {
caption: "-",
tip: "",
},
tbitem13: {
caption: "导出",
tip: "导出",
},
tbitem10: {
caption: "-",
tip: "",
},
tbitem16: {
caption: "其它",
tip: "其它",
},
tbitem21: {
caption: "导出数据模型",
tip: "导出数据模型",
},
tbitem23: {
caption: "数据导入",
tip: "数据导入",
},
tbitem17: {
caption: "-",
tip: "",
},
tbitem19: {
caption: "过滤",
tip: "过滤",
},
tbitem18: {
caption: "帮助",
tip: "帮助",
},
},
editviewtoolbar_toolbar: {
tbitem3: {
caption: "保存",
tip: "保存",
},
tbitem6: {
caption: "-",
tip: "",
},
tbitem7: {
caption: "删除并关闭",
tip: "删除并关闭",
},
tbitem8: {
caption: "-",
tip: "",
},
tbitem12: {
caption: "新建",
tip: "新建",
},
tbitem13: {
caption: "-",
tip: "",
},
tbitem14: {
caption: "拷贝",
tip: "拷贝",
},
tbitem16: {
caption: "-",
tip: "",
},
tbitem18: {
caption: "其它",
tip: "其它",
},
tbitem5: {
caption: "保存并关闭",
tip: "保存并关闭",
},
tbitem4: {
caption: "保存并新建",
tip: "保存并新建",
},
tbitem23: {
caption: "第一个记录",
tip: "第一个记录",
},
tbitem24: {
caption: "上一个记录",
tip: "上一个记录",
},
tbitem25: {
caption: "下一个记录",
tip: "下一个记录",
},
tbitem26: {
caption: "最后一个记录",
tip: "最后一个记录",
},
tbitem22: {
caption: "帮助",
tip: "帮助",
},
},
};
\ No newline at end of file
......@@ -171,6 +171,24 @@ mock.onGet('v7/lite-indexappmenu').reply((config: any) => {
textcls: '',
appfunctag: 'AppFunc4',
resourcetag: '',
},
{
id: '8DAB721A-F1FD-42E3-9EC7-C2871C815FF5',
name: 'menuitem10',
text: '大屏',
type: 'MENUITEM',
counterid: '',
tooltip: '大屏',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: 'AppFunc10',
resourcetag: '',
},
],
}];
......
此差异已折叠。
......@@ -21,4 +21,5 @@ import './entity/meta-modules/meta-modules';
import './entity/dst-data-sources/dst-data-sources';
import './entity/dst-systems/dst-systems';
import './entity/meta-relationships/meta-relationships';
import './entity/blade-visuals/blade-visuals';
import './entity/meta-entitys/meta-entitys';
......@@ -47,6 +47,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "MetaModelGridView",
"viewtag": "18d59a3ac7947d7123e0be76e7cb71c0"
},
"bladevisualgridview": {
"title": "大屏展示表格视图",
"caption": "可视化表",
"viewtype": "DEGRIDVIEW",
"viewmodule": "avuedata",
"viewname": "BladeVisualGridView",
"viewtag": "1acb538e571dd5728a1ac2a7248304db"
},
"dstappgridview": {
"title": "应用表格视图",
"caption": "应用",
......@@ -295,6 +303,14 @@ mock.onGet('./assets/json/view-config.json').reply((config: any) => {
"viewname": "DstSystemEditView",
"viewtag": "a74ac9914f18ea5f417e041085f19c7f"
},
"bladevisualeditview": {
"title": "大屏展示编辑视图",
"caption": "可视化表",
"viewtype": "DEEDITVIEW",
"viewmodule": "avuedata",
"viewname": "BladeVisualEditView",
"viewtag": "ae17e402fbd7acdc83dcb52139cfffe2"
},
"metamoduleeditview": {
"title": "模块编辑视图",
"caption": "模块",
......
.view-card {
>.ivu-card-extra {
top: 5px;
right: 0px;
}
}
.blade-visual-edit-view{
position: relative;
}
.toolbar-container {
button {
margin: 6px 0px 4px 4px;
.caption {
margin-left: 4px;
}
}
.seperator {
color: #dcdee2;
margin: 0 0px 0 4px;
}
}
// this is less
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import BladeVisualEditViewBase from './blade-visual-edit-view-base.vue';
import view_form from '@widgets/blade-visual/main-form/main-form.vue';
@Component({
components: {
view_form,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
if(!Object.is(vm.navModel,"route")){
vm.initNavDataWithTab(vm.viewCacheData);
}
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class BladeVisualEditView extends BladeVisualEditViewBase {
}
</script>
\ No newline at end of file
.blade-visual-grid-view{
position: relative;
}
.toolbar-container {
button {
margin: 6px 0px 4px 4px;
.caption {
margin-left: 4px;
}
}
.seperator {
color: #dcdee2;
margin: 0 0px 0 4px;
}
}
// this is less
<script lang='tsx'>
import { Component } from 'vue-property-decorator';
import BladeVisualGridViewBase from './blade-visual-grid-view-base.vue';
import view_grid from '@widgets/blade-visual/main-grid/main-grid.vue';
import view_searchform from '@widgets/blade-visual/default-searchform/default-searchform.vue';
@Component({
components: {
view_grid,
view_searchform,
},
beforeRouteEnter: (to: any, from: any, next: any) => {
next((vm: any) => {
if(!Object.is(vm.navModel,"route")){
vm.initNavDataWithTab(vm.viewCacheData);
}
vm.$store.commit('addCurPageViewtag', { fullPath: to.fullPath, viewtag: vm.viewtag });
});
},
})
export default class BladeVisualGridView extends BladeVisualGridViewBase {
}
</script>
\ No newline at end of file
......@@ -293,11 +293,11 @@ export default class DstAPIEditViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -283,11 +283,11 @@ export default class DstAPIGridViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -293,11 +293,11 @@ export default class DstAppEditViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -283,11 +283,11 @@ export default class DstAppGridViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -293,11 +293,11 @@ export default class DstComponentEditViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -283,11 +283,11 @@ export default class DstComponentGridViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -293,11 +293,11 @@ export default class DstDataSourceEditViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -283,11 +283,11 @@ export default class DstDataSourceGridViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -178,11 +178,11 @@ export default class DstDataSourcePickupGridViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -165,11 +165,11 @@ export default class DstDataSourcePickupViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
if(this.viewparams.selectedData){
this.selectedData = JSON.stringify(this.viewparams.selectedData);
......
......@@ -293,11 +293,11 @@ export default class DstMicroserviceEditViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -283,11 +283,11 @@ export default class DstMicroserviceGridViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -178,11 +178,11 @@ export default class DstMicroservicePickupGridViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -165,11 +165,11 @@ export default class DstMicroservicePickupViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
if(this.viewparams.selectedData){
this.selectedData = JSON.stringify(this.viewparams.selectedData);
......
......@@ -293,11 +293,11 @@ export default class DstRouterEditViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -283,11 +283,11 @@ export default class DstRouterGridViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -293,11 +293,11 @@ export default class DstViewEditViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -283,11 +283,11 @@ export default class DstViewGridViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
......@@ -15,6 +15,7 @@ export const PageComponents = {
Vue.component('meta-model-grid-view', () => import('@pages/lite/meta-model-grid-view/meta-model-grid-view.vue'));
Vue.component('dst-router-grid-view', () => import('@pages/lite/dst-router-grid-view/dst-router-grid-view.vue'));
Vue.component('dst-microservice-grid-view', () => import('@pages/lite/dst-microservice-grid-view/dst-microservice-grid-view.vue'));
Vue.component('blade-visual-grid-view', () => import('@pages/avuedata/blade-visual-grid-view/blade-visual-grid-view.vue'));
Vue.component('meta-field-pickup-view', () => import('@pages/lite/meta-field-pickup-view/meta-field-pickup-view.vue'));
Vue.component('meta-relationship-edit-view', () => import('@pages/lite/meta-relationship-edit-view/meta-relationship-edit-view.vue'));
Vue.component('dst-data-source-pickup-view', () => import('@pages/lite/dst-data-source-pickup-view/dst-data-source-pickup-view.vue'));
......@@ -25,6 +26,7 @@ export const PageComponents = {
Vue.component('meta-relationship-edit-grid-view', () => import('@pages/lite/meta-relationship-edit-grid-view/meta-relationship-edit-grid-view.vue'));
Vue.component('dst-microservice-pickup-view', () => import('@pages/lite/dst-microservice-pickup-view/dst-microservice-pickup-view.vue'));
Vue.component('meta-field-pickup-grid-view', () => import('@pages/lite/meta-field-pickup-grid-view/meta-field-pickup-grid-view.vue'));
Vue.component('blade-visual-edit-view', () => import('@pages/avuedata/blade-visual-edit-view/blade-visual-edit-view.vue'));
Vue.component('dst-component-edit-view', () => import('@pages/lite/dst-component-edit-view/dst-component-edit-view.vue'));
Vue.component('dst-router-edit-view', () => import('@pages/lite/dst-router-edit-view/dst-router-edit-view.vue'));
Vue.component('dst-app-grid-view', () => import('@pages/lite/dst-app-grid-view/dst-app-grid-view.vue'));
......
......@@ -522,6 +522,20 @@ const router = new Router({
},
component: () => import('@pages/lite/dst-microservice-grid-view/dst-microservice-grid-view.vue'),
},
{
path: 'bladevisuals/:bladevisual?/gridview/:gridview?',
meta: {
caption: 'entities.bladevisual.views.gridview.caption',
info:'',
parameters: [
{ pathName: 'liteindex', parameterName: 'liteindex' },
{ pathName: 'bladevisuals', parameterName: 'bladevisual' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
requireAuth: true,
},
component: () => import('@pages/avuedata/blade-visual-grid-view/blade-visual-grid-view.vue'),
},
{
path: 'dstsystems/:dstsystem?/metaentities/:metaentity?/metafields/:metafield?/pickupview/:pickupview?',
meta: {
......@@ -893,6 +907,20 @@ const router = new Router({
},
component: () => import('@pages/lite/meta-field-pickup-grid-view/meta-field-pickup-grid-view.vue'),
},
{
path: 'bladevisuals/:bladevisual?/editview/:editview?',
meta: {
caption: 'entities.bladevisual.views.editview.caption',
info:'',
parameters: [
{ pathName: 'liteindex', parameterName: 'liteindex' },
{ pathName: 'bladevisuals', parameterName: 'bladevisual' },
{ pathName: 'editview', parameterName: 'editview' },
],
requireAuth: true,
},
component: () => import('@pages/avuedata/blade-visual-edit-view/blade-visual-edit-view.vue'),
},
{
path: 'dstsystems/:dstsystem?/dstapps/:dstapp?/dstcomponents/:dstcomponent?/editview/:editview?',
meta: {
......@@ -1332,6 +1360,19 @@ const router = new Router({
},
component: () => import('@pages/lite/meta-model-grid-view/meta-model-grid-view.vue'),
},
{
path: '/bladevisuals/:bladevisual?/gridview/:gridview?',
meta: {
caption: 'entities.bladevisual.views.gridview.caption',
info:'',
parameters: [
{ pathName: 'bladevisuals', parameterName: 'bladevisual' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
requireAuth: true,
},
component: () => import('@pages/avuedata/blade-visual-grid-view/blade-visual-grid-view.vue'),
},
{
path: '/dstsystems/:dstsystem?/dstapps/:dstapp?/gridview/:gridview?',
meta: {
......@@ -2091,6 +2132,19 @@ const router = new Router({
},
component: () => import('@pages/lite/dst-data-source-pickup-grid-view/dst-data-source-pickup-grid-view.vue'),
},
{
path: '/bladevisuals/:bladevisual?/editview/:editview?',
meta: {
caption: 'entities.bladevisual.views.editview.caption',
info:'',
parameters: [
{ pathName: 'bladevisuals', parameterName: 'bladevisual' },
{ pathName: 'editview', parameterName: 'editview' },
],
requireAuth: true,
},
component: () => import('@pages/avuedata/blade-visual-edit-view/blade-visual-edit-view.vue'),
},
{
path: '/dstsystems/:dstsystem?/metaentities/:metaentity?/metadatasets/:metadataset?/editview/:editview?',
meta: {
......
......@@ -293,11 +293,11 @@ export default class MetaDataSetEditViewBase extends Vue {
@Watch('viewparam',{immediate: true, deep: true})
onParamData(newVal: any, oldVal: any) {
if(newVal){
for(let key in this.viewparams){
delete this.viewparams[key];
}
if(typeof this.viewparams == 'string') {
this.viewparams = {};
if(typeof newVal == 'string') {
Object.assign(this.viewparams, JSON.parse(this.viewparam));
}else{
this.viewparams = Util.deepCopy(this.viewparam);
}
}
......
此差异已折叠。
Markdown 格式
0% or
您添加了 0 到此讨论。请谨慎行事。
先完成此消息的编辑!
想要评论请 注册