Skip to content

I
ibzlite
提交 dde435ef 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibiz4j 发布系统代码

上级 e331cd1f
展开全部 隐藏空白字符变更
内嵌 并排
正在显示 包含 4522 行增加 和 518 行删除
app_web/public/assets/json/data-dictionary.json
浏览文件 @ dde435ef
......@@ -64,6 +64,35 @@
"codename":"Dynamicgrid",
"value": "DynamicGrid",
"disabled": false
}
]
},
{
"srfkey": "AppType",
"emptytext": "未定义",
"codelisttype":"static",
"items": [
{
"id": "INNER",
"label": "内置应用",
"text": "内置应用",
"class":"",
"data":"",
"codename":"Inner",
"value": "INNER",
"disabled": false
}
, {
"id": "THIRD-PARTY",
"label": "第三方应用",
"text": "第三方应用",
"class":"",
"data":"",
"codename":"Third_SUB_party",
"value": "THIRD-PARTY",
"disabled": false
}
]
......
app_web/src/locale/lang/en-US.ts
浏览文件 @ dde435ef
......@@ -141,6 +141,11 @@ export default {
liteindex: {
menuitem2: "数据源",
menuitem1: "实体",
menuitem9: "模型",
menuitem6: "微服务",
menuitem8: "接口",
menuitem5: "应用",
menuitem7: "路由",
menuitem3: "视图",
menuitem4: "组件",
},
......
app_web/src/locale/lang/zh-CN.ts
浏览文件 @ dde435ef
......@@ -141,6 +141,11 @@ export default {
liteindex: {
menuitem2: "数据源",
menuitem1: "实体",
menuitem9: "模型",
menuitem6: "微服务",
menuitem8: "接口",
menuitem5: "应用",
menuitem7: "路由",
menuitem3: "视图",
menuitem4: "组件",
},
......
app_web/src/locale/lanres/codelist/codelist_en_US.ts
浏览文件 @ dde435ef
......@@ -10,4 +10,9 @@ export default {
"DynamicGrid": "动态表格",
"empty": ""
},
AppType: {
"INNER": "内置应用",
"THIRD-PARTY": "第三方应用",
"empty": ""
},
};
\ No newline at end of file
app_web/src/locale/lanres/codelist/codelist_zh_CN.ts
浏览文件 @ dde435ef
......@@ -10,4 +10,9 @@ export default {
"DynamicGrid": "动态表格",
"empty": "",
},
AppType: {
"INNER": "内置应用",
"THIRD-PARTY": "第三方应用",
"empty": "",
},
};
\ No newline at end of file
app_web/src/locale/lanres/entities/dst-api/dst-api_en_US.ts
浏览文件 @ dde435ef
......@@ -6,8 +6,8 @@ export default {
path: "路径",
system_id: "系统标识",
ms_id: "微服务标识",
ms_name: "微服务标识",
service_name: "微服务标识",
ms_name: "微服务名称",
service_name: "服务名",
},
views: {
gridview: {
......@@ -23,8 +23,6 @@ export default {
details: {
group1: "接口基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srforikey: "",
srfkey: "标识",
srfmajortext: "名称",
......@@ -33,12 +31,24 @@ export default {
srfdeid: "",
srfsourcekey: "",
apiid: "标识",
apiname: "名称",
servicename: "服务名",
apipath: "路径",
msid: "微服务标识",
msname: "微服务名称",
systemid: "系统标识",
},
uiactions: {
},
},
main_grid: {
columns: {
apiname: "名称",
apipath: "路径",
msname: "微服务名称",
servicename: "服务名",
systemid: "系统标识",
msid: "微服务标识",
},
uiactions: {
},
......@@ -46,6 +56,11 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_apiname_like: "名称(文本包含(%))",
n_msname_like: "微服务标识(文本包含(%))",
n_servicename_like: "微服务标识(文本包含(%))",
n_apipath_like: "路径(文本包含(%))",
n_systemid_eq: "系统标识(等于(=))",
},
uiactions: {
},
......
app_web/src/locale/lanres/entities/dst-api/dst-api_zh_CN.ts
浏览文件 @ dde435ef
......@@ -5,8 +5,8 @@ export default {
path: "路径",
system_id: "系统标识",
ms_id: "微服务标识",
ms_name: "微服务标识",
service_name: "微服务标识",
ms_name: "微服务名称",
service_name: "服务名",
},
views: {
gridview: {
......@@ -22,8 +22,6 @@ export default {
details: {
group1: "接口基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srforikey: "",
srfkey: "标识",
srfmajortext: "名称",
......@@ -32,12 +30,24 @@ export default {
srfdeid: "",
srfsourcekey: "",
apiid: "标识",
apiname: "名称",
servicename: "服务名",
apipath: "路径",
msid: "微服务标识",
msname: "微服务名称",
systemid: "系统标识",
},
uiactions: {
},
},
main_grid: {
columns: {
apiname: "名称",
apipath: "路径",
msname: "微服务名称",
servicename: "服务名",
systemid: "系统标识",
msid: "微服务标识",
},
uiactions: {
},
......@@ -45,6 +55,11 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_apiname_like: "名称(文本包含(%))",
n_msname_like: "微服务标识(文本包含(%))",
n_servicename_like: "微服务标识(文本包含(%))",
n_apipath_like: "路径(文本包含(%))",
n_systemid_eq: "系统标识(等于(=))",
},
uiactions: {
},
......
app_web/src/locale/lanres/entities/dst-app/dst-app_en_US.ts
浏览文件 @ dde435ef
......@@ -41,12 +41,29 @@ export default {
srfdeid: "",
srfsourcekey: "",
appid: "应用标识",
appname: "应用名",
fullname: "全称",
apptype: "类型",
appgroup: "分组",
pssystemid: "系统标识",
visabled: "可见",
icon: "图标",
addr: "地址",
},
uiactions: {
},
},
main_grid: {
columns: {
appid: "应用标识",
appname: "应用名",
fullname: "全称",
apptype: "类型",
appgroup: "分组",
icon: "图标",
addr: "地址",
visabled: "可见",
pssystemid: "系统标识",
},
uiactions: {
},
......@@ -54,6 +71,9 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_appname_like: "应用名(文本包含(%))",
n_apptype_eq: "类型(等于(=))",
n_pssystemid_eq: "系统标识(等于(=))",
},
uiactions: {
},
......
app_web/src/locale/lanres/entities/dst-app/dst-app_zh_CN.ts
浏览文件 @ dde435ef
......@@ -40,12 +40,29 @@ export default {
srfdeid: "",
srfsourcekey: "",
appid: "应用标识",
appname: "应用名",
fullname: "全称",
apptype: "类型",
appgroup: "分组",
pssystemid: "系统标识",
visabled: "可见",
icon: "图标",
addr: "地址",
},
uiactions: {
},
},
main_grid: {
columns: {
appid: "应用标识",
appname: "应用名",
fullname: "全称",
apptype: "类型",
appgroup: "分组",
icon: "图标",
addr: "地址",
visabled: "可见",
pssystemid: "系统标识",
},
uiactions: {
},
......@@ -53,6 +70,9 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_appname_like: "应用名(文本包含(%))",
n_apptype_eq: "类型(等于(=))",
n_pssystemid_eq: "系统标识(等于(=))",
},
uiactions: {
},
......
app_web/src/locale/lanres/entities/dst-microservice/dst-microservice_en_US.ts
浏览文件 @ dde435ef
......@@ -29,8 +29,6 @@ export default {
details: {
group1: "微服务基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srforikey: "",
srfkey: "标识",
srfmajortext: "名称",
......@@ -39,12 +37,20 @@ export default {
srfdeid: "",
srfsourcekey: "",
msid: "标识",
msname: "名称",
servicename: "服务名",
addr: "地址",
systemid: "系统标识",
},
uiactions: {
},
},
main_grid: {
columns: {
msname: "名称",
servicename: "服务名",
addr: "地址",
systemid: "系统标识",
},
uiactions: {
},
......@@ -52,6 +58,9 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_msname_like: "名称(文本包含(%))",
n_servicename_eq: "服务名(等于(=))",
n_systemid_eq: "系统标识(等于(=))",
},
uiactions: {
},
......
app_web/src/locale/lanres/entities/dst-microservice/dst-microservice_zh_CN.ts
浏览文件 @ dde435ef
......@@ -28,8 +28,6 @@ export default {
details: {
group1: "微服务基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srforikey: "",
srfkey: "标识",
srfmajortext: "名称",
......@@ -38,12 +36,20 @@ export default {
srfdeid: "",
srfsourcekey: "",
msid: "标识",
msname: "名称",
servicename: "服务名",
addr: "地址",
systemid: "系统标识",
},
uiactions: {
},
},
main_grid: {
columns: {
msname: "名称",
servicename: "服务名",
addr: "地址",
systemid: "系统标识",
},
uiactions: {
},
......@@ -51,6 +57,9 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_msname_like: "名称(文本包含(%))",
n_servicename_eq: "服务名(等于(=))",
n_systemid_eq: "系统标识(等于(=))",
},
uiactions: {
},
......
app_web/src/locale/lanres/entities/dst-router/dst-router_en_US.ts
浏览文件 @ dde435ef
......@@ -6,7 +6,7 @@ export default {
system_id: "系统标识",
app_id: "应用标识",
path: "路径",
parentid: "路径标识",
parentid: "父路径标识",
meta: "meta",
component: "组件",
},
......@@ -28,8 +28,6 @@ export default {
details: {
group1: "路由基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srforikey: "",
srfkey: "路径标识",
srfmajortext: "路径名称",
......@@ -37,6 +35,13 @@ export default {
srfuf: "",
srfdeid: "",
srfsourcekey: "",
routername: "路径名称",
routerpath: "路径",
component: "组件",
meta: "meta",
parentid: "父路径标识",
systemid: "系统标识",
appid: "应用标识",
routerid: "路径标识",
},
uiactions: {
......@@ -44,6 +49,9 @@ export default {
},
main_grid: {
columns: {
routername: "路径名称",
routerpath: "路径",
component: "组件",
},
uiactions: {
},
......@@ -51,6 +59,10 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_routername_like: "路径名称(文本包含(%))",
n_routerpath_like: "路径(文本包含(%))",
n_systemid_eq: "系统标识(等于(=))",
n_appid_eq: "应用标识(等于(=))",
},
uiactions: {
},
......
app_web/src/locale/lanres/entities/dst-router/dst-router_zh_CN.ts
浏览文件 @ dde435ef
......@@ -5,7 +5,7 @@ export default {
system_id: "系统标识",
app_id: "应用标识",
path: "路径",
parentid: "路径标识",
parentid: "父路径标识",
meta: "meta",
component: "组件",
},
......@@ -27,8 +27,6 @@ export default {
details: {
group1: "路由基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srforikey: "",
srfkey: "路径标识",
srfmajortext: "路径名称",
......@@ -36,6 +34,13 @@ export default {
srfuf: "",
srfdeid: "",
srfsourcekey: "",
routername: "路径名称",
routerpath: "路径",
component: "组件",
meta: "meta",
parentid: "父路径标识",
systemid: "系统标识",
appid: "应用标识",
routerid: "路径标识",
},
uiactions: {
......@@ -43,6 +48,9 @@ export default {
},
main_grid: {
columns: {
routername: "路径名称",
routerpath: "路径",
component: "组件",
},
uiactions: {
},
......@@ -50,6 +58,10 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_routername_like: "路径名称(文本包含(%))",
n_routerpath_like: "路径(文本包含(%))",
n_systemid_eq: "系统标识(等于(=))",
n_appid_eq: "应用标识(等于(=))",
},
uiactions: {
},
......
app_web/src/locale/lanres/entities/dst-system/dst-system_en_US.ts
浏览文件 @ dde435ef
......@@ -30,8 +30,6 @@ export default {
details: {
group1: "系统基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srforikey: "",
srfkey: "系统标识",
srfmajortext: "系统名称",
......@@ -40,12 +38,17 @@ export default {
srfdeid: "",
srfsourcekey: "",
pssystemid: "系统标识",
pssystemname: "系统名称",
showorder: "排序",
},
uiactions: {
},
},
main_grid: {
columns: {
pssystemid: "系统标识",
pssystemname: "系统名称",
showorder: "排序",
},
uiactions: {
},
......@@ -53,6 +56,7 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_pssystemname_like: "系统名称(文本包含(%))",
},
uiactions: {
},
......
app_web/src/locale/lanres/entities/dst-system/dst-system_zh_CN.ts
浏览文件 @ dde435ef
......@@ -29,8 +29,6 @@ export default {
details: {
group1: "系统基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srforikey: "",
srfkey: "系统标识",
srfmajortext: "系统名称",
......@@ -39,12 +37,17 @@ export default {
srfdeid: "",
srfsourcekey: "",
pssystemid: "系统标识",
pssystemname: "系统名称",
showorder: "排序",
},
uiactions: {
},
},
main_grid: {
columns: {
pssystemid: "系统标识",
pssystemname: "系统名称",
showorder: "排序",
},
uiactions: {
},
......@@ -52,6 +55,7 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_pssystemname_like: "系统名称(文本包含(%))",
},
uiactions: {
},
......
app_web/src/locale/lanres/entities/meta-model/meta-model_en_US.ts
浏览文件 @ dde435ef
......@@ -20,8 +20,6 @@ export default {
details: {
group1: "模型基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srforikey: "",
srfkey: "标识",
srfmajortext: "名称",
......@@ -29,6 +27,9 @@ export default {
srfuf: "",
srfdeid: "",
srfsourcekey: "",
modelname: "名称",
codename: "代码名称",
modelcfg: "配置",
modelid: "标识",
},
uiactions: {
......@@ -36,6 +37,8 @@ export default {
},
main_grid: {
columns: {
modelname: "名称",
codename: "代码名称",
},
uiactions: {
},
......@@ -43,6 +46,7 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_modelname_like: "名称(%)",
},
uiactions: {
},
......
app_web/src/locale/lanres/entities/meta-model/meta-model_zh_CN.ts
浏览文件 @ dde435ef
......@@ -19,8 +19,6 @@ export default {
details: {
group1: "模型基本信息",
formpage1: "基本信息",
group2: "操作信息",
formpage2: "其它",
srforikey: "",
srfkey: "标识",
srfmajortext: "名称",
......@@ -28,6 +26,9 @@ export default {
srfuf: "",
srfdeid: "",
srfsourcekey: "",
modelname: "名称",
codename: "代码名称",
modelcfg: "配置",
modelid: "标识",
},
uiactions: {
......@@ -35,6 +36,8 @@ export default {
},
main_grid: {
columns: {
modelname: "名称",
codename: "代码名称",
},
uiactions: {
},
......@@ -42,6 +45,7 @@ export default {
default_searchform: {
details: {
formpage1: "常规条件",
n_modelname_like: "名称(%)",
},
uiactions: {
},
......
app_web/src/mock/app/lite-index-appmenu/lite-index-appmenu.ts
浏览文件 @ dde435ef
......@@ -45,6 +45,96 @@ mock.onGet('v7/lite-indexappmenu').reply((config: any) => {
textcls: '',
appfunctag: 'AppFunc',
resourcetag: '',
},
{
id: 'A9C57D33-0396-4595-AF22-4AB01652C900',
name: 'menuitem9',
text: '模型',
type: 'MENUITEM',
counterid: '',
tooltip: '模型',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: 'AppFunc9',
resourcetag: '',
},
{
id: '46AB50C7-6CDC-4CA9-ADB8-BB1CE8B2CF4D',
name: 'menuitem6',
text: '微服务',
type: 'MENUITEM',
counterid: '',
tooltip: '微服务',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: 'AppFunc6',
resourcetag: '',
},
{
id: '2465B8D8-0519-412B-9D34-1F3355FB9EAF',
name: 'menuitem8',
text: '接口',
type: 'MENUITEM',
counterid: '',
tooltip: '接口',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: 'AppFunc8',
resourcetag: '',
},
{
id: '6FBDA444-19F9-4382-BBED-AE16FB3C7DBE',
name: 'menuitem5',
text: '应用',
type: 'MENUITEM',
counterid: '',
tooltip: '应用',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: 'AppFunc5',
resourcetag: '',
},
{
id: '72F4E9D3-2443-49F9-85B4-6CC42A268322',
name: 'menuitem7',
text: '路由',
type: 'MENUITEM',
counterid: '',
tooltip: '路由',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: 'AppFunc7',
resourcetag: '',
},
{
id: 'E7008324-F31D-4CB7-B2E6-F3CE660996B0',
......
app_web/src/mock/codelist/codelist.ts
浏览文件 @ dde435ef
......@@ -72,6 +72,35 @@ mock.onGet('./assets/json/data-dictionary.json').reply((config: any) => {
"codename":"Dynamicgrid",
value: "DynamicGrid",
disabled: false,
},
]
},
{
srfkey: "AppType",
emptytext: "未定义",
"codelisttype":"static",
items: [
{
id: "INNER",
label: "内置应用",
text: "内置应用",
"class":"",
"data":"",
"codename":"Inner",
value: "INNER",
disabled: false,
},
{
id: "THIRD-PARTY",
label: "第三方应用",
text: "第三方应用",
"class":"",
"data":"",
"codename":"Third_SUB_party",
value: "THIRD-PARTY",
disabled: false,
},
]
......
app_web/src/pages/lite/dst-apigrid-view/dst-apigrid-view-base.vue
浏览文件 @ dde435ef
......@@ -1259,16 +1259,28 @@ export default class DstAPIGridViewBase extends Vue {
}
const parameters: any[] = [
{ pathName: 'dstapis', parameterName: 'dstapi' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'dst-apiedit-view',
height: 0,
width: 0,
title: this.$t('entities.dstapi.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -1305,17 +1317,31 @@ export default class DstAPIGridViewBase extends Vue {
}
const parameters: any[] = [
{ pathName: 'dstapis', parameterName: 'dstapi' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
if(fullargs && fullargs.copymode){
Object.assign(data,{copymode:true});
}
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'dst-apiedit-view',
height: 0,
width: 0,
title: this.$t('entities.dstapi.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_web/src/pages/lite/dst-app-grid-view/dst-app-grid-view-base.vue
浏览文件 @ dde435ef
......@@ -1259,16 +1259,28 @@ export default class DstAppGridViewBase extends Vue {
}
const parameters: any[] = [
{ pathName: 'dstapps', parameterName: 'dstapp' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'dst-app-edit-view',
height: 0,
width: 0,
title: this.$t('entities.dstapp.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -1305,17 +1317,31 @@ export default class DstAppGridViewBase extends Vue {
}
const parameters: any[] = [
{ pathName: 'dstapps', parameterName: 'dstapp' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
if(fullargs && fullargs.copymode){
Object.assign(data,{copymode:true});
}
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'dst-app-edit-view',
height: 0,
width: 0,
title: this.$t('entities.dstapp.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_web/src/pages/lite/dst-data-source-grid-view/dst-data-source-grid-view-base.vue
浏览文件 @ dde435ef
......@@ -1254,16 +1254,28 @@ export default class DstDataSourceGridViewBase extends Vue {
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'dstdatasources', parameterName: 'dstdatasource' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'dst-data-source-edit-view',
height: 0,
width: 0,
title: this.$t('entities.dstdatasource.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -1295,17 +1307,31 @@ export default class DstDataSourceGridViewBase extends Vue {
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'dstdatasources', parameterName: 'dstdatasource' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
if(fullargs && fullargs.copymode){
Object.assign(data,{copymode:true});
}
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'dst-data-source-edit-view',
height: 0,
width: 0,
title: this.$t('entities.dstdatasource.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_web/src/pages/lite/dst-microservice-grid-view/dst-microservice-grid-view-base.vue
浏览文件 @ dde435ef
......@@ -1259,16 +1259,28 @@ export default class DstMicroserviceGridViewBase extends Vue {
}
const parameters: any[] = [
{ pathName: 'dstmicroservices', parameterName: 'dstmicroservice' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'dst-microservice-edit-view',
height: 0,
width: 0,
title: this.$t('entities.dstmicroservice.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -1305,17 +1317,31 @@ export default class DstMicroserviceGridViewBase extends Vue {
}
const parameters: any[] = [
{ pathName: 'dstmicroservices', parameterName: 'dstmicroservice' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
if(fullargs && fullargs.copymode){
Object.assign(data,{copymode:true});
}
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'dst-microservice-edit-view',
height: 0,
width: 0,
title: this.$t('entities.dstmicroservice.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_web/src/pages/lite/dst-router-grid-view/dst-router-grid-view-base.vue
浏览文件 @ dde435ef
......@@ -1259,16 +1259,28 @@ export default class DstRouterGridViewBase extends Vue {
}
const parameters: any[] = [
{ pathName: 'dstrouters', parameterName: 'dstrouter' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
const openIndexViewTab = (data: any) => {
const _data: any = { w: (new Date().getTime()) };
Object.assign(_data, data);
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, _data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'dst-router-edit-view',
height: 0,
width: 0,
title: this.$t('entities.dstrouter.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......@@ -1305,17 +1317,31 @@ export default class DstRouterGridViewBase extends Vue {
}
const parameters: any[] = [
{ pathName: 'dstrouters', parameterName: 'dstrouter' },
{ pathName: 'editview', parameterName: 'editview' },
];
const _this: any = this;
if(fullargs && fullargs.copymode){
Object.assign(data,{copymode:true});
}
const openIndexViewTab = (data: any) => {
const routePath = this.$viewTool.buildUpRoutePath(this.$route, tempContext, deResParameters, parameters, args, data);
this.$router.push(routePath);
const openDrawer = (view: any, data: any) => {
let container: Subject<any> = this.$appdrawer.openDrawer(view, tempContext, data);
container.subscribe((result: any) => {
if (!result || !Object.is(result.ret, 'OK')) {
return;
}
if (!xData || !(xData.refresh instanceof Function)) {
return;
}
xData.refresh(result.datas);
});
}
openIndexViewTab(data);
const view: any = {
viewname: 'dst-router-edit-view',
height: 0,
width: 0,
title: this.$t('entities.dstrouter.views.editview.title'),
placement: 'DRAWER_RIGHT',
};
openDrawer(view, data);
}
......
app_web/src/pages/lite/lite-index/page-register.ts
浏览文件 @ dde435ef
export const PageComponents = {
install(Vue: any, opt: any) {
Vue.component('meta-field-pickup-view', () => import('@pages/lite/meta-field-pickup-view/meta-field-pickup-view.vue'));
Vue.component('dst-microservice-edit-view', () => import('@pages/lite/dst-microservice-edit-view/dst-microservice-edit-view.vue'));
Vue.component('meta-model-edit-view', () => import('@pages/lite/meta-model-edit-view/meta-model-edit-view.vue'));
Vue.component('dst-data-source-grid-view', () => import('@pages/lite/dst-data-source-grid-view/dst-data-source-grid-view.vue'));
Vue.component('dst-microservice-pickup-grid-view', () => import('@pages/lite/dst-microservice-pickup-grid-view/dst-microservice-pickup-grid-view.vue'));
Vue.component('dst-data-source-pickup-grid-view', () => import('@pages/lite/dst-data-source-pickup-grid-view/dst-data-source-pickup-grid-view.vue'));
Vue.component('meta-relationship-pickup-view', () => import('@pages/lite/meta-relationship-pickup-view/meta-relationship-pickup-view.vue'));
Vue.component('dst-apigrid-view', () => import('@pages/lite/dst-apigrid-view/dst-apigrid-view.vue'));
Vue.component('meta-field-edit-view', () => import('@pages/lite/meta-field-edit-view/meta-field-edit-view.vue'));
Vue.component('meta-data-set-grid-view', () => import('@pages/lite/meta-data-set-grid-view/meta-data-set-grid-view.vue'));
Vue.component('dst-view-edit-view', () => import('@pages/lite/dst-view-edit-view/dst-view-edit-view.vue'));
Vue.component('meta-entity-pickup-view', () => import('@pages/lite/meta-entity-pickup-view/meta-entity-pickup-view.vue'));
Vue.component('meta-data-set-edit-view', () => import('@pages/lite/meta-data-set-edit-view/meta-data-set-edit-view.vue'));
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('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'));
Vue.component('dst-component-grid-view', () => import('@pages/lite/dst-component-grid-view/dst-component-grid-view.vue'));
Vue.component('meta-field-edit-grid-view', () => import('@pages/lite/meta-field-edit-grid-view/meta-field-edit-grid-view.vue'));
Vue.component('dst-data-source-grid-view', () => import('@pages/lite/dst-data-source-grid-view/dst-data-source-grid-view.vue'));
Vue.component('meta-entity-pickup-grid-view', () => import('@pages/lite/meta-entity-pickup-grid-view/meta-entity-pickup-grid-view.vue'));
Vue.component('dst-data-source-pickup-grid-view', () => import('@pages/lite/dst-data-source-pickup-grid-view/dst-data-source-pickup-grid-view.vue'));
Vue.component('meta-entity-edit-view', () => import('@pages/lite/meta-entity-edit-view/meta-entity-edit-view.vue'));
Vue.component('meta-relationship-edit-grid-view', () => import('@pages/lite/meta-relationship-edit-grid-view/meta-relationship-edit-grid-view.vue'));
Vue.component('meta-relationship-pickup-view', () => import('@pages/lite/meta-relationship-pickup-view/meta-relationship-pickup-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('meta-field-edit-view', () => import('@pages/lite/meta-field-edit-view/meta-field-edit-view.vue'));
Vue.component('dst-component-edit-view', () => import('@pages/lite/dst-component-edit-view/dst-component-edit-view.vue'));
Vue.component('meta-data-set-grid-view', () => import('@pages/lite/meta-data-set-grid-view/meta-data-set-grid-view.vue'));
Vue.component('dst-view-edit-view', () => import('@pages/lite/dst-view-edit-view/dst-view-edit-view.vue'));
Vue.component('meta-entity-pickup-view', () => import('@pages/lite/meta-entity-pickup-view/meta-entity-pickup-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'));
Vue.component('dst-view-grid-view', () => import('@pages/lite/dst-view-grid-view/dst-view-grid-view.vue'));
Vue.component('meta-data-set-edit-view', () => import('@pages/lite/meta-data-set-edit-view/meta-data-set-edit-view.vue'));
Vue.component('meta-entity-grid-view', () => import('@pages/lite/meta-entity-grid-view/meta-entity-grid-view.vue'));
Vue.component('dst-apiedit-view', () => import('@pages/lite/dst-apiedit-view/dst-apiedit-view.vue'));
Vue.component('dst-app-edit-view', () => import('@pages/lite/dst-app-edit-view/dst-app-edit-view.vue'));
Vue.component('meta-relationship-pickup-grid-view', () => import('@pages/lite/meta-relationship-pickup-grid-view/meta-relationship-pickup-grid-view.vue'));
Vue.component('dst-data-source-edit-view', () => import('@pages/lite/dst-data-source-edit-view/dst-data-source-edit-view.vue'));
}
......
app_web/src/store/modules/view-action/state.ts
浏览文件 @ dde435ef
......@@ -188,6 +188,7 @@ export const viewstate: any = {
viewaction: '',
viewdatachange: false,
refviews: [
'cf3c723968e116fa32e08679011b9552',
],
},
{
......@@ -286,9 +287,14 @@ export const viewstate: any = {
viewdatachange: false,
refviews: [
'10aa45718d82d8f115c75ba01abb2de1',
'1ade7920c947bf50c32012de9962a92d',
'33ec4b7d5a31addaec9b033067520820',
'd613248735503950b91cb7094b036cdc',
'18d59a3ac7947d7123e0be76e7cb71c0',
'88894333da0e2e0f7a556ecabf7b48ab',
'9c46a7edc5d5d3a08e75ca57fcb7b03c',
'16af256f35cdf891e8e04f8fe652e91b',
'4f19fa8bfbce2c71261ca7cc076f316e',
],
},
{
......
app_web/src/widgets/app/lite-index-appmenu/lite-index-appmenu-base.vue
浏览文件 @ dde435ef
......@@ -582,6 +582,21 @@ export default class LiteIndexBase extends Vue implements ControlInterface {
navDataService.removeNavData(this.viewtag);
}
switch (item.appfunctag) {
case 'AppFunc7':
this.clickAppFunc7(item);
return;
case 'AppFunc5':
this.clickAppFunc5(item);
return;
case 'AppFunc9':
this.clickAppFunc9(item);
return;
case 'AppFunc6':
this.clickAppFunc6(item);
return;
case 'AppFunc8':
this.clickAppFunc8(item);
return;
case 'AppFunc4':
this.clickAppFunc4(item);
return;
......@@ -601,6 +616,121 @@ export default class LiteIndexBase extends Vue implements ControlInterface {
}
/**
* 路由
*
* @param {*} [item={}]
* @memberof LiteIndex
*/
public clickAppFunc7(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'dstrouters', parameterName: 'dstrouter' },
{ pathName: 'gridview', parameterName: 'gridview' },
];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
}
/**
* 应用
*
* @param {*} [item={}]
* @memberof LiteIndex
*/
public clickAppFunc5(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'dstapps', parameterName: 'dstapp' },
{ pathName: 'gridview', parameterName: 'gridview' },
];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
}
/**
* 模型
*
* @param {*} [item={}]
* @memberof LiteIndex
*/
public clickAppFunc9(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'metamodels', parameterName: 'metamodel' },
{ pathName: 'gridview', parameterName: 'gridview' },
];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
}
/**
* 微服务
*
* @param {*} [item={}]
* @memberof LiteIndex
*/
public clickAppFunc6(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'dstmicroservices', parameterName: 'dstmicroservice' },
{ pathName: 'gridview', parameterName: 'gridview' },
];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
}
/**
* 接口
*
* @param {*} [item={}]
* @memberof LiteIndex
*/
public clickAppFunc8(item: any = {}) {
const viewparam: any = {};
Object.assign(viewparam, {});
const deResParameters: any[] = [];
const parameters: any[] = [
{ pathName: 'dstapis', parameterName: 'dstapi' },
{ pathName: 'gridview', parameterName: 'gridview' },
];
const path: string = this.$viewTool.buildUpRoutePath(this.$route, {}, deResParameters, parameters, [], viewparam);
if(Object.is(this.$route.fullPath,path)){
return;
}
this.$nextTick(function(){
this.$router.push(path);
})
}
/**
* 组件
*
......
app_web/src/widgets/app/lite-index-appmenu/lite-index-appmenu-model.ts
浏览文件 @ dde435ef
......@@ -51,6 +51,101 @@ export default class LiteIndexModel {
appfunctag: 'AppFunc',
resourcetag: '',
authtag:'web-liteIndex-menuitem1',
},
{
id: 'A9C57D33-0396-4595-AF22-4AB01652C900',
name: 'menuitem9',
text: '模型',
type: 'MENUITEM',
counterid: '',
tooltip: '模型',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: 'AppFunc9',
resourcetag: '',
authtag:'web-liteIndex-menuitem9',
},
{
id: '46AB50C7-6CDC-4CA9-ADB8-BB1CE8B2CF4D',
name: 'menuitem6',
text: '微服务',
type: 'MENUITEM',
counterid: '',
tooltip: '微服务',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: 'AppFunc6',
resourcetag: '',
authtag:'web-liteIndex-menuitem6',
},
{
id: '2465B8D8-0519-412B-9D34-1F3355FB9EAF',
name: 'menuitem8',
text: '接口',
type: 'MENUITEM',
counterid: '',
tooltip: '接口',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: 'AppFunc8',
resourcetag: '',
authtag:'web-liteIndex-menuitem8',
},
{
id: '6FBDA444-19F9-4382-BBED-AE16FB3C7DBE',
name: 'menuitem5',
text: '应用',
type: 'MENUITEM',
counterid: '',
tooltip: '应用',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: 'AppFunc5',
resourcetag: '',
authtag:'web-liteIndex-menuitem5',
},
{
id: '72F4E9D3-2443-49F9-85B4-6CC42A268322',
name: 'menuitem7',
text: '路由',
type: 'MENUITEM',
counterid: '',
tooltip: '路由',
expanded: false,
separator: false,
hidden: false,
hidesidebar: false,
opendefault: false,
iconcls: '',
icon: '',
textcls: '',
appfunctag: 'AppFunc7',
resourcetag: '',
authtag:'web-liteIndex-menuitem7',
},
{
id: 'E7008324-F31D-4CB7-B2E6-F3CE660996B0',
......@@ -100,6 +195,66 @@ export default class LiteIndexModel {
* @memberof LiteIndexModel
*/
public funcs: any[] = [
{
appfunctag: 'AppFunc7',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'dstroutergridview',
deResParameters: [],
routepath: '/liteindex/:liteindex?/dstrouters/:dstrouter?/gridview/:gridview?',
parameters: [
{ pathName: 'dstrouters', parameterName: 'dstrouter' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
},
{
appfunctag: 'AppFunc5',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'dstappgridview',
deResParameters: [],
routepath: '/liteindex/:liteindex?/dstapps/:dstapp?/gridview/:gridview?',
parameters: [
{ pathName: 'dstapps', parameterName: 'dstapp' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
},
{
appfunctag: 'AppFunc9',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'metamodelgridview',
deResParameters: [],
routepath: '/liteindex/:liteindex?/metamodels/:metamodel?/gridview/:gridview?',
parameters: [
{ pathName: 'metamodels', parameterName: 'metamodel' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
},
{
appfunctag: 'AppFunc6',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'dstmicroservicegridview',
deResParameters: [],
routepath: '/liteindex/:liteindex?/dstmicroservices/:dstmicroservice?/gridview/:gridview?',
parameters: [
{ pathName: 'dstmicroservices', parameterName: 'dstmicroservice' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
},
{
appfunctag: 'AppFunc8',
appfuncyype: 'APPVIEW',
openmode: '',
codename: 'dstapigridview',
deResParameters: [],
routepath: '/liteindex/:liteindex?/dstapis/:dstapi?/gridview/:gridview?',
parameters: [
{ pathName: 'dstapis', parameterName: 'dstapi' },
{ pathName: 'gridview', parameterName: 'gridview' },
],
},
{
appfunctag: 'AppFunc4',
appfuncyype: 'APPVIEW',
......
app_web/src/widgets/dst-api/default-searchform/default-searchform-model.ts
浏览文件 @ dde435ef
......@@ -25,6 +25,31 @@ export default class DefaultModel {
prop: 'srffrontuf',
dataType: 'TEXT',
},
{
name: 'n_apiname_like',
prop: 'name',
dataType: 'TEXT',
},
{
name: 'n_msname_like',
prop: 'ms_name',
dataType: 'PICKUPTEXT',
},
{
name: 'n_servicename_like',
prop: 'service_name',
dataType: 'PICKUPDATA',
},
{
name: 'n_apipath_like',
prop: 'path',
dataType: 'LONGTEXT_1000',
},
{
name: 'n_systemid_eq',
prop: 'system_id',
dataType: 'PICKUP',
},
]
}
......
app_web/src/widgets/dst-api/main-form/main-form-model.ts
浏览文件 @ dde435ef
......@@ -55,6 +55,36 @@ export default class MainModel {
prop: 'id',
dataType: 'TEXT',
},
{
name: 'apiname',
prop: 'name',
dataType: 'TEXT',
},
{
name: 'servicename',
prop: 'service_name',
dataType: 'PICKUPDATA',
},
{
name: 'apipath',
prop: 'path',
dataType: 'LONGTEXT_1000',
},
{
name: 'msid',
prop: 'ms_id',
dataType: 'PICKUP',
},
{
name: 'msname',
prop: 'ms_name',
dataType: 'PICKUPTEXT',
},
{
name: 'systemid',
prop: 'system_id',
dataType: 'PICKUP',
},
{
name: 'dstapi',
prop: 'id',
......
app_web/src/widgets/dst-api/main-form/main-form-service.ts
浏览文件 @ dde435ef
......@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
import ControlService from '@/widgets/control-service';
import DstAPIService from '@/service/dst-api/dst-api-service';
import MainModel from './main-form-model';
import DstMicroserviceService from '@/service/dst-microservice/dst-microservice-service';
/**
......@@ -41,6 +42,14 @@ export default class MainService extends ControlService {
this.model = new MainModel();
}
/**
* 微服务服务对象
*
* @type {DstMicroserviceService}
* @memberof MainService
*/
public dstmicroserviceService: DstMicroserviceService = new DstMicroserviceService();
/**
* 处理数据
*
......@@ -82,6 +91,9 @@ export default class MainService extends ControlService {
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
if (Object.is(serviceName, 'DstMicroserviceService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.dstmicroserviceService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'id', 'dstmicroservice');
}
return Promise.reject([])
}
......@@ -164,6 +176,7 @@ export default class MainService extends ControlService {
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean,isWorkflow?:boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{id: data.apiid, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
......
app_web/src/widgets/dst-api/main-grid/main-grid-model.ts
浏览文件 @ dde435ef
......@@ -30,11 +30,36 @@ export default class MainModel {
name: 'systemid',
prop: 'system_id',
dataType: 'PICKUP',
isEditable:true
},
{
name: 'msid',
prop: 'ms_id',
dataType: 'PICKUP',
isEditable:true
},
{
name: 'msname',
prop: 'ms_name',
dataType: 'PICKUPTEXT',
isEditable:true
},
{
name: 'apiname',
prop: 'name',
dataType: 'TEXT',
isEditable:true
},
{
name: 'servicename',
prop: 'service_name',
dataType: 'PICKUPDATA',
},
{
name: 'apipath',
prop: 'path',
dataType: 'LONGTEXT_1000',
isEditable:true
},
{
name: 'srfmajortext',
......@@ -56,6 +81,31 @@ export default class MainModel {
name: 'dstapi',
prop: 'id',
},
{
name: 'n_apiname_like',
prop: 'n_apiname_like',
dataType: 'QUERYPARAM'
},
{
name: 'n_msname_like',
prop: 'n_msname_like',
dataType: 'QUERYPARAM'
},
{
name: 'n_servicename_like',
prop: 'n_servicename_like',
dataType: 'QUERYPARAM'
},
{
name: 'n_apipath_like',
prop: 'n_apipath_like',
dataType: 'QUERYPARAM'
},
{
name: 'n_systemid_eq',
prop: 'n_systemid_eq',
dataType: 'QUERYPARAM'
},
{
name:'size',
......
app_web/src/widgets/dst-api/main-grid/main-grid-service.ts
浏览文件 @ dde435ef
......@@ -2,6 +2,7 @@ import { Http,Util,Errorlog } from '@/utils';
import ControlService from '@/widgets/control-service';
import DstAPIService from '@/service/dst-api/dst-api-service';
import MainModel from './main-grid-model';
import DstMicroserviceService from '@/service/dst-microservice/dst-microservice-service';
/**
......@@ -50,6 +51,14 @@ export default class MainService extends ControlService {
public copynativeData:any;
/**
* 微服务服务对象
*
* @type {DstMicroserviceService}
* @memberof MainService
*/
public dstmicroserviceService: DstMicroserviceService = new DstMicroserviceService();
/**
* 处理数据
*
......@@ -91,6 +100,9 @@ export default class MainService extends ControlService {
public getItems(serviceName: string, interfaceName: string, context: any = {}, data: any, isloading?: boolean): Promise<any[]> {
data.page = data.page ? data.page : 0;
data.size = data.size ? data.size : 1000;
if (Object.is(serviceName, 'DstMicroserviceService') && Object.is(interfaceName, 'FetchDefault')) {
return this.doItems(this.dstmicroserviceService.FetchDefault(JSON.parse(JSON.stringify(context)),data, isloading), 'id', 'dstmicroservice');
}
return Promise.reject([])
}
......
app_web/src/widgets/dst-app/default-searchform/default-searchform-base.vue
浏览文件 @ dde435ef
......@@ -4,7 +4,41 @@
<row>
<i-col span="20" class="form-content">
<row>
</row>
<i-col v-show="detailsModel.n_appname_like.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_appname_like' :itemRules="this.rules.n_appname_like" class='' :caption="$t('entities.dstapp.default_searchform.details.n_appname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_appname_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.n_appname_like"
@enter="onEnter($event)"
:disabled="detailsModel.n_appname_like.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_apptype_eq.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_apptype_eq' :itemRules="this.rules.n_apptype_eq" class='' :caption="$t('entities.dstapp.default_searchform.details.n_apptype_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_apptype_eq.error" :isEmptyCaption="false" labelPos="LEFT">
<dropdown-list
v-model="data.n_apptype_eq"
:data="data"
:context="context"
:viewparams="viewparams"
:localContext ='{ }'
:localParam ='{ }'
:disabled="detailsModel.n_apptype_eq.disabled"
valueType="string"
tag='AppType'
codelistType='STATIC'
placeholder='请选择...' style="">
</dropdown-list>
</app-form-item>
</i-col>
</row>
</i-col>
<i-col span="4" class="search-button">
<row v-show="Object.keys(data).length>0">
......@@ -260,6 +294,9 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
public data: any = {
n_appname_like: null,
n_apptype_eq: null,
n_pssystemid_eq: null,
};
/**
......@@ -269,6 +306,24 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
public rules: any = {
n_appname_like: [
{ type: 'string', message: '应用名(文本包含(%)) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '应用名(文本包含(%)) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '应用名(文本包含(%)) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '应用名(文本包含(%)) 值不能为空', trigger: 'blur' },
],
n_apptype_eq: [
{ type: 'string', message: '类型(等于(=)) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '类型(等于(=)) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '类型(等于(=)) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '类型(等于(=)) 值不能为空', trigger: 'blur' },
],
n_pssystemid_eq: [
{ type: 'string', message: '系统标识(等于(=)) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '系统标识(等于(=)) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '系统标识(等于(=)) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '系统标识(等于(=)) 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -279,9 +334,51 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public detailsModel: any = {
formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
n_appname_like: new FormItemModel({ caption: '应用名(文本包含(%))', detailType: 'FORMITEM', name: 'n_appname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_apptype_eq: new FormItemModel({ caption: '类型(等于(=))', detailType: 'FORMITEM', name: 'n_apptype_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_pssystemid_eq: new FormItemModel({ caption: '系统标识(等于(=))', detailType: 'FORMITEM', name: 'n_pssystemid_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
};
/**
* 监控表单属性 n_appname_like 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_appname_like')
onN_appname_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_appname_like', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_apptype_eq 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_apptype_eq')
onN_apptype_eqChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_apptype_eq', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_pssystemid_eq 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_pssystemid_eq')
onN_pssystemid_eqChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_pssystemid_eq', newVal: newVal, oldVal: oldVal });
}
/**
* 重置表单项值
......@@ -303,6 +400,9 @@ export default class DefaultBase extends Vue implements ControlInterface {
public formLogic({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
}
/**
......@@ -380,6 +480,9 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
public createDefault(){
if (this.data.hasOwnProperty('n_pssystemid_eq')) {
this.data['n_pssystemid_eq'] = this.context['dstsystemid'];
}
}
/**
......
app_web/src/widgets/dst-app/default-searchform/default-searchform-model.ts
浏览文件 @ dde435ef
......@@ -25,6 +25,21 @@ export default class DefaultModel {
prop: 'srffrontuf',
dataType: 'TEXT',
},
{
name: 'n_appname_like',
prop: 'label',
dataType: 'TEXT',
},
{
name: 'n_apptype_eq',
prop: 'type',
dataType: 'SSCODELIST',
},
{
name: 'n_pssystemid_eq',
prop: 'systemid',
dataType: 'PICKUP',
},
]
}
......
app_web/src/widgets/dst-app/main-form/main-form-model.ts
浏览文件 @ dde435ef
......@@ -55,6 +55,46 @@ export default class MainModel {
prop: 'id',
dataType: 'TEXT',
},
{
name: 'appname',
prop: 'label',
dataType: 'TEXT',
},
{
name: 'fullname',
prop: 'fullname',
dataType: 'TEXT',
},
{
name: 'apptype',
prop: 'type',
dataType: 'SSCODELIST',
},
{
name: 'appgroup',
prop: 'group',
dataType: 'TEXT',
},
{
name: 'pssystemid',
prop: 'systemid',
dataType: 'PICKUP',
},
{
name: 'visabled',
prop: 'visabled',
dataType: 'YESNO',
},
{
name: 'icon',
prop: 'icon',
dataType: 'TEXT',
},
{
name: 'addr',
prop: 'addr',
dataType: 'TEXT',
},
{
name: 'dstapp',
prop: 'id',
......
app_web/src/widgets/dst-app/main-form/main-form-service.ts
浏览文件 @ dde435ef
......@@ -164,6 +164,7 @@ export default class MainService extends ControlService {
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean,isWorkflow?:boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{id: data.appid, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
......
app_web/src/widgets/dst-app/main-grid/main-grid-model.ts
浏览文件 @ dde435ef
......@@ -26,11 +26,41 @@ export default class MainModel {
]
}else{
return [
{
name: 'icon',
prop: 'icon',
dataType: 'TEXT',
},
{
name: 'visabled',
prop: 'visabled',
dataType: 'YESNO',
},
{
name: 'appname',
prop: 'label',
dataType: 'TEXT',
},
{
name: 'pssystemid',
prop: 'systemid',
dataType: 'PICKUP',
},
{
name: 'appid',
prop: 'id',
dataType: 'TEXT',
},
{
name: 'addr',
prop: 'addr',
dataType: 'TEXT',
},
{
name: 'apptype',
prop: 'type',
dataType: 'SSCODELIST',
},
{
name: 'srfmajortext',
prop: 'label',
......@@ -47,10 +77,35 @@ export default class MainModel {
dataType: 'TEXT',
isEditable:true
},
{
name: 'appgroup',
prop: 'group',
dataType: 'TEXT',
},
{
name: 'fullname',
prop: 'fullname',
dataType: 'TEXT',
},
{
name: 'dstapp',
prop: 'id',
},
{
name: 'n_appname_like',
prop: 'n_appname_like',
dataType: 'QUERYPARAM'
},
{
name: 'n_apptype_eq',
prop: 'n_apptype_eq',
dataType: 'QUERYPARAM'
},
{
name: 'n_pssystemid_eq',
prop: 'n_pssystemid_eq',
dataType: 'QUERYPARAM'
},
{
name:'size',
......
app_web/src/widgets/dst-microservice/default-searchform/default-searchform-base.vue
浏览文件 @ dde435ef
......@@ -4,7 +4,35 @@
<row>
<i-col span="20" class="form-content">
<row>
</row>
<i-col v-show="detailsModel.n_msname_like.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_msname_like' :itemRules="this.rules.n_msname_like" class='' :caption="$t('entities.dstmicroservice.default_searchform.details.n_msname_like')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_msname_like.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.n_msname_like"
@enter="onEnter($event)"
:disabled="detailsModel.n_msname_like.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
<i-col v-show="detailsModel.n_servicename_eq.visible" :style="{}" :sm="{ span: 12, offset: 0 }" :md="{ span: 12, offset: 0 }" :lg="{ span: 8, offset: 0 }" :xl="{ span: 8, offset: 0 }">
<app-form-item name='n_servicename_eq' :itemRules="this.rules.n_servicename_eq" class='' :caption="$t('entities.dstmicroservice.default_searchform.details.n_servicename_eq')" uiStyle="DEFAULT" :labelWidth="130" :isShowCaption="true" :error="detailsModel.n_servicename_eq.error" :isEmptyCaption="false" labelPos="LEFT">
<input-box
v-model="data.n_servicename_eq"
@enter="onEnter($event)"
:disabled="detailsModel.n_servicename_eq.disabled"
type='text'
style="">
</input-box>
</app-form-item>
</i-col>
</row>
</i-col>
<i-col span="4" class="search-button">
<row v-show="Object.keys(data).length>0">
......@@ -260,6 +288,9 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
public data: any = {
n_msname_like: null,
n_servicename_eq: null,
n_systemid_eq: null,
};
/**
......@@ -269,6 +300,24 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
public rules: any = {
n_msname_like: [
{ type: 'string', message: '名称(文本包含(%)) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '名称(文本包含(%)) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '名称(文本包含(%)) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '名称(文本包含(%)) 值不能为空', trigger: 'blur' },
],
n_servicename_eq: [
{ type: 'string', message: '服务名(等于(=)) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '服务名(等于(=)) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '服务名(等于(=)) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '服务名(等于(=)) 值不能为空', trigger: 'blur' },
],
n_systemid_eq: [
{ type: 'string', message: '系统标识(等于(=)) 值必须为字符串类型', trigger: 'change' },
{ type: 'string', message: '系统标识(等于(=)) 值必须为字符串类型', trigger: 'blur' },
{ required: false, type: 'string', message: '系统标识(等于(=)) 值不能为空', trigger: 'change' },
{ required: false, type: 'string', message: '系统标识(等于(=)) 值不能为空', trigger: 'blur' },
],
}
/**
......@@ -279,9 +328,51 @@ export default class DefaultBase extends Vue implements ControlInterface {
*/
public detailsModel: any = {
formpage1: new FormPageModel({ caption: '常规条件', detailType: 'FORMPAGE', name: 'formpage1', visible: true, isShowCaption: true, form: this })
,
n_msname_like: new FormItemModel({ caption: '名称(文本包含(%))', detailType: 'FORMITEM', name: 'n_msname_like', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_servicename_eq: new FormItemModel({ caption: '服务名(等于(=))', detailType: 'FORMITEM', name: 'n_servicename_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
n_systemid_eq: new FormItemModel({ caption: '系统标识(等于(=))', detailType: 'FORMITEM', name: 'n_systemid_eq', visible: true, isShowCaption: true, form: this, disabled: false, enableCond: 3 })
,
};
/**
* 监控表单属性 n_msname_like 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_msname_like')
onN_msname_likeChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_msname_like', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_servicename_eq 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_servicename_eq')
onN_servicename_eqChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_servicename_eq', newVal: newVal, oldVal: oldVal });
}
/**
* 监控表单属性 n_systemid_eq 值
*
* @param {*} newVal
* @param {*} oldVal
* @memberof DefaultBase
*/
@Watch('data.n_systemid_eq')
onN_systemid_eqChange(newVal: any, oldVal: any) {
this.formDataChange({ name: 'n_systemid_eq', newVal: newVal, oldVal: oldVal });
}
/**
* 重置表单项值
......@@ -303,6 +394,9 @@ export default class DefaultBase extends Vue implements ControlInterface {
public formLogic({ name, newVal, oldVal }: { name: string, newVal: any, oldVal: any }): void {
}
/**
......@@ -380,6 +474,9 @@ export default class DefaultBase extends Vue implements ControlInterface {
* @memberof DefaultBase
*/
public createDefault(){
if (this.data.hasOwnProperty('n_systemid_eq')) {
this.data['n_systemid_eq'] = this.context['dstsystemid'];
}
}
/**
......
app_web/src/widgets/dst-microservice/default-searchform/default-searchform-model.ts
浏览文件 @ dde435ef
......@@ -25,6 +25,21 @@ export default class DefaultModel {
prop: 'srffrontuf',
dataType: 'TEXT',
},
{
name: 'n_msname_like',
prop: 'label',
dataType: 'TEXT',
},
{
name: 'n_servicename_eq',
prop: 'servicename',
dataType: 'TEXT',
},
{
name: 'n_systemid_eq',
prop: 'pssystemid',
dataType: 'PICKUP',
},
]
}
......
app_web/src/widgets/dst-microservice/main-form/main-form-model.ts
浏览文件 @ dde435ef
......@@ -55,6 +55,26 @@ export default class MainModel {
prop: 'id',
dataType: 'TEXT',
},
{
name: 'msname',
prop: 'label',
dataType: 'TEXT',
},
{
name: 'servicename',
prop: 'servicename',
dataType: 'TEXT',
},
{
name: 'addr',
prop: 'addr',
dataType: 'TEXT',
},
{
name: 'systemid',
prop: 'pssystemid',
dataType: 'PICKUP',
},
{
name: 'dstmicroservice',
prop: 'id',
......
app_web/src/widgets/dst-microservice/main-form/main-form-service.ts
浏览文件 @ dde435ef
......@@ -164,6 +164,7 @@ export default class MainService extends ControlService {
@Errorlog
public add(action: string, context: any = {},data: any = {}, isloading?: boolean,isWorkflow?:boolean): Promise<any> {
const {data:Data,context:Context} = this.handleRequestData(action,context,data);
Object.assign(Data,{id: data.msid, srffrontuf: '1'});
return new Promise((resolve: any, reject: any) => {
let result: Promise<any>;
const _appEntityService: any = this.appEntityService;
......
app_web/src/widgets/dst-microservice/main-grid/main-grid-base.vue
浏览文件 @ dde435ef
......@@ -21,6 +21,62 @@
<template v-if="!isSingleSelect">
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('msname')">
<el-table-column show-overflow-tooltip :prop="'msname'" :label="$t('entities.dstmicroservice.main_grid.columns.msname')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.dstmicroservice.main_grid.columns.msname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<app-span name='msname' editorType="TEXTBOX" :value="row.msname" dataType="TEXT" precision="0" ></app-span>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('servicename')">
<el-table-column show-overflow-tooltip :prop="'servicename'" :label="$t('entities.dstmicroservice.main_grid.columns.servicename')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.dstmicroservice.main_grid.columns.servicename')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<app-span name='servicename' editorType="TEXTBOX" :value="row.servicename" dataType="TEXT" precision="0" ></app-span>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('addr')">
<el-table-column show-overflow-tooltip :prop="'addr'" :label="$t('entities.dstmicroservice.main_grid.columns.addr')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.dstmicroservice.main_grid.columns.addr')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<app-span name='addr' editorType="TEXTBOX" :value="row.addr" dataType="TEXT" precision="0" ></app-span>
</template>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('systemid')">
<el-table-column show-overflow-tooltip :prop="'systemid'" :label="$t('entities.dstmicroservice.main_grid.columns.systemid')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.dstmicroservice.main_grid.columns.systemid')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<template >
<app-span name='systemid' editorType="HIDDEN" :value="row.systemid" dataType="PICKUP" precision="0" ></app-span>
</template>
</template>
</el-table-column>
</template>
<template v-if="adaptiveState">
<el-table-column></el-table-column>
</template>
......@@ -478,7 +534,7 @@ export default class MainBase extends Vue implements ControlInterface {
*
* @memberof MainBase
*/
public defaultUpdateItems:Array<any> =[];
public defaultUpdateItems:Array<any> =[,,,,];
/**
* 选中行数据
......@@ -548,6 +604,38 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public allColumns: any[] = [
{
name: 'msname',
label: '名称',
langtag: 'entities.dstmicroservice.main_grid.columns.msname',
show: true,
unit: 'PX',
isEnableRowEdit: false,
},
{
name: 'servicename',
label: '服务名',
langtag: 'entities.dstmicroservice.main_grid.columns.servicename',
show: true,
unit: 'PX',
isEnableRowEdit: false,
},
{
name: 'addr',
label: '地址',
langtag: 'entities.dstmicroservice.main_grid.columns.addr',
show: true,
unit: 'PX',
isEnableRowEdit: false,
},
{
name: 'systemid',
label: '系统标识',
langtag: 'entities.dstmicroservice.main_grid.columns.systemid',
show: false,
unit: 'PX',
isEnableRowEdit: false,
},
]
/**
......@@ -602,6 +690,10 @@ export default class MainBase extends Vue implements ControlInterface {
*/
public getGridRowModel(){
return {
systemid: new FormItemModel(),
msname: new FormItemModel(),
servicename: new FormItemModel(),
addr: new FormItemModel(),
srfkey: new FormItemModel(),
}
}
......@@ -622,6 +714,22 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public rules: any = {
systemid: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '系统标识 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '系统标识 值不能为空', trigger: 'blur' },
],
msname: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '名称 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '名称 值不能为空', trigger: 'blur' },
],
servicename: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '服务名 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '服务名 值不能为空', trigger: 'blur' },
],
addr: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '地址 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '地址 值不能为空', trigger: 'blur' },
],
srfkey: [
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标识 值不能为空', trigger: 'change' },
{ required: false, validator: (rule:any, value:any, callback:any) => { return (rule.required && (value === null || value === undefined || value === "")) ? false : true;}, message: '标识 值不能为空', trigger: 'blur' },
......@@ -1189,7 +1297,7 @@ export default class MainBase extends Vue implements ControlInterface {
* @memberof MainBase
*/
public arraySpanMethod({row, column, rowIndex, columnIndex} : any) {
let allColumns:Array<any> = [];
let allColumns:Array<any> = ['msname','servicename','addr','systemid'];
if(row && row.children && row.children.length>0) {
if(columnIndex == (this.isSingleSelect ? 0:1)) {
return [1, allColumns.length+1];
......@@ -1232,6 +1340,10 @@ export default class MainBase extends Vue implements ControlInterface {
const tree: any ={
groupById: Number((groupIndex+1)*10),
group: group,
msname:'',
servicename:'',
addr:'',
systemid:'',
children: children,
}
groupTree.push(tree);
......
app_web/src/widgets/dst-router/default-searchform/default-searchform-model.ts
浏览文件 @ dde435ef
......@@ -25,6 +25,26 @@ export default class DefaultModel {
prop: 'srffrontuf',
dataType: 'TEXT',
},
{
name: 'n_routername_like',
prop: 'name',
dataType: 'TEXT',
},
{
name: 'n_routerpath_like',
prop: 'path',
dataType: 'TEXT',
},
{
name: 'n_systemid_eq',
prop: 'system_id',
dataType: 'PICKUP',
},
{
name: 'n_appid_eq',
prop: 'app_id',
dataType: 'PICKUP',
},
]
}
......
config.xml
浏览文件 @ dde435ef
此差异已折叠。
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或