Skip to content

I
iBiz企业中心
提交 33839d8e 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

xignzi006 部署微服务应用

上级 0d1fbb0e
隐藏空白字符变更
内嵌 并排
正在显示 包含 74 行增加 和 74 行删除
app_WebSite/src/interface/entity/web-site-channel.ts
浏览文件 @ 33839d8e
......@@ -95,7 +95,7 @@ export interface WebSiteChannel {
channeltype?: any;
/**
* 频道业务标识
* 业务标识
*
* @returns {*}
* @memberof WebSiteChannel
......
app_WebSite/src/locale/lanres/entities/web-site-channel/web-site-channel_en_US.ts
浏览文件 @ 33839d8e
......@@ -12,7 +12,7 @@ export default {
pwebsitechannelname: "上级频道",
websitename: "站点",
channeltype: "频道类型",
channelcode: "频道业务标识",
channelcode: "业务标识",
sn: "序号",
memo: "备注",
validflag: "是否启用",
......@@ -51,6 +51,7 @@ export default {
websitename: "站点",
sn: "序号",
websitechannelname: "频道名称",
channelcode: "业务标识",
channeltype: "频道类型",
pwebsitechannelname: "上级频道",
validflag: "是否启用",
......
app_WebSite/src/locale/lanres/entities/web-site-channel/web-site-channel_zh_CN.ts
浏览文件 @ 33839d8e
......@@ -11,7 +11,7 @@ export default {
pwebsitechannelname: "上级频道",
websitename: "站点",
channeltype: "频道类型",
channelcode: "频道业务标识",
channelcode: "业务标识",
sn: "序号",
memo: "备注",
validflag: "是否启用",
......@@ -50,6 +50,7 @@ export default {
websitename: "站点",
sn: "序号",
websitechannelname: "频道名称",
channelcode: "业务标识",
channeltype: "频道类型",
pwebsitechannelname: "上级频道",
validflag: "是否启用",
......
app_WebSite/src/locale/lanres/entities/web-site-content/web-site-content_en_US.ts
浏览文件 @ 33839d8e
......@@ -56,10 +56,9 @@ export default {
websitename: "站点",
websitechannelname: "频道",
sn: "序号",
websitecontentname: "内容名称",
contenttype: "内容类型",
contentcode: "业务标识",
title: "标题",
contentcode: "业务标识",
author: "作者",
validflag: "是否启用",
memo: "备注",
......
app_WebSite/src/locale/lanres/entities/web-site-content/web-site-content_zh_CN.ts
浏览文件 @ 33839d8e
......@@ -55,10 +55,9 @@ export default {
websitename: "站点",
websitechannelname: "频道",
sn: "序号",
websitecontentname: "内容名称",
contenttype: "内容类型",
contentcode: "业务标识",
title: "标题",
contentcode: "业务标识",
author: "作者",
validflag: "是否启用",
memo: "备注",
......
app_WebSite/src/widgets/web-site-channel/main-grid/main-grid-base.tsx
浏览文件 @ 33839d8e
......@@ -77,6 +77,13 @@ export class MainGridBase extends GridControllerBase {
show: true,
util: 'PX'
},
{
name: 'channelcode',
label: '业务标识',
langtag: 'entities.websitechannel.main_grid.columns.channelcode',
show: true,
util: 'PX'
},
{
name: 'channeltype',
label: '频道类型',
......@@ -142,6 +149,7 @@ export class MainGridBase extends GridControllerBase {
'websitename':false,
'sn':false,
'websitechannelname':false,
'channelcode':false,
'channeltype':false,
'pwebsitechannelname':false,
'validflag':false,
......
app_WebSite/src/widgets/web-site-channel/main-grid/main-grid-model.ts
浏览文件 @ 33839d8e
......@@ -31,21 +31,11 @@ export default class MainModel {
prop: 'sn',
dataType: 'INT',
},
{
name: 'channeltype',
prop: 'channeltype',
dataType: 'SSCODELIST',
},
{
name: 'memo',
prop: 'memo',
dataType: 'LONGTEXT_1000',
},
{
name: 'websiteid',
prop: 'websiteid',
dataType: 'PICKUP',
},
{
name: 'pwebsitechannelname',
prop: 'pwebsitechannelname',
......@@ -62,18 +52,38 @@ export default class MainModel {
dataType: 'TEXT',
},
{
name: 'srfdataaccaction',
name: 'websitechannelname',
prop: 'websitechannelname',
dataType: 'TEXT',
},
{
name: 'srfkey',
prop: 'websitechannelid',
dataType: 'GUID',
},
{
name: 'srfkey',
name: 'srfdataaccaction',
prop: 'websitechannelid',
dataType: 'GUID',
},
{
name: 'websitechannelname',
prop: 'websitechannelname',
name: 'validflag',
prop: 'validflag',
dataType: 'YESNO',
},
{
name: 'channeltype',
prop: 'channeltype',
dataType: 'SSCODELIST',
},
{
name: 'websiteid',
prop: 'websiteid',
dataType: 'PICKUP',
},
{
name: 'channelcode',
prop: 'channelcode',
dataType: 'TEXT',
},
{
......@@ -81,11 +91,6 @@ export default class MainModel {
prop: 'websitename',
dataType: 'PICKUPTEXT',
},
{
name: 'validflag',
prop: 'validflag',
dataType: 'YESNO',
},
{
name: 'websitechannel',
prop: 'websitechannelid',
......
app_WebSite/src/widgets/web-site-channel/main-grid/main-grid.html
浏览文件 @ 33839d8e
......@@ -24,7 +24,7 @@
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('websitename')">
<el-table-column show-overflow-tooltip :prop="'websitename'" :label="$t('entities.websitechannel.main_grid.columns.websitename')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'websitename'" :label="$t('entities.websitechannel.main_grid.columns.websitename')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.websitechannel.main_grid.columns.websitename')}}
......@@ -48,7 +48,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('websitechannelname')">
<el-table-column show-overflow-tooltip :prop="'websitechannelname'" :label="$t('entities.websitechannel.main_grid.columns.websitechannelname')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'websitechannelname'" :label="$t('entities.websitechannel.main_grid.columns.websitechannelname')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.websitechannel.main_grid.columns.websitechannelname')}}
......@@ -59,6 +59,18 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('channelcode')">
<el-table-column show-overflow-tooltip :prop="'channelcode'" :label="$t('entities.websitechannel.main_grid.columns.channelcode')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.websitechannel.main_grid.columns.channelcode')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.channelcode}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('channeltype')">
<el-table-column show-overflow-tooltip :prop="'channeltype'" :label="$t('entities.websitechannel.main_grid.columns.channeltype')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -72,7 +84,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('pwebsitechannelname')">
<el-table-column show-overflow-tooltip :prop="'pwebsitechannelname'" :label="$t('entities.websitechannel.main_grid.columns.pwebsitechannelname')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'pwebsitechannelname'" :label="$t('entities.websitechannel.main_grid.columns.pwebsitechannelname')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.websitechannel.main_grid.columns.pwebsitechannelname')}}
......
app_WebSite/src/widgets/web-site-content/main-grid/main-grid-base.tsx
浏览文件 @ 33839d8e
......@@ -77,13 +77,6 @@ export class MainGridBase extends GridControllerBase {
show: true,
util: 'PX'
},
{
name: 'websitecontentname',
label: '内容名称',
langtag: 'entities.websitecontent.main_grid.columns.websitecontentname',
show: true,
util: 'PX'
},
{
name: 'contenttype',
label: '内容类型',
......@@ -92,16 +85,16 @@ export class MainGridBase extends GridControllerBase {
util: 'PX'
},
{
name: 'contentcode',
label: '业务标识',
langtag: 'entities.websitecontent.main_grid.columns.contentcode',
name: 'title',
label: '标题',
langtag: 'entities.websitecontent.main_grid.columns.title',
show: true,
util: 'PX'
},
{
name: 'title',
label: '标题',
langtag: 'entities.websitecontent.main_grid.columns.title',
name: 'contentcode',
label: '业务标识',
langtag: 'entities.websitecontent.main_grid.columns.contentcode',
show: true,
util: 'PX'
},
......@@ -163,10 +156,9 @@ export class MainGridBase extends GridControllerBase {
'websitename':false,
'websitechannelname':false,
'sn':false,
'websitecontentname':false,
'contenttype':false,
'contentcode':false,
'title':false,
'contentcode':false,
'author':false,
'validflag':false,
'memo':false,
......
app_WebSite/src/widgets/web-site-content/main-grid/main-grid-model.ts
浏览文件 @ 33839d8e
......@@ -81,11 +81,6 @@ export default class MainModel {
prop: 'websitechannelid',
dataType: 'PICKUP',
},
{
name: 'websitecontentname',
prop: 'websitecontentname',
dataType: 'TEXT',
},
{
name: 'websiteid',
prop: 'websiteid',
......
app_WebSite/src/widgets/web-site-content/main-grid/main-grid.html
浏览文件 @ 33839d8e
......@@ -24,7 +24,7 @@
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('websitename')">
<el-table-column show-overflow-tooltip :prop="'websitename'" :label="$t('entities.websitecontent.main_grid.columns.websitename')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'websitename'" :label="$t('entities.websitecontent.main_grid.columns.websitename')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.websitecontent.main_grid.columns.websitename')}}
......@@ -36,7 +36,7 @@
</el-table-column>
</template>
<template v-if="getColumnState('websitechannelname')">
<el-table-column show-overflow-tooltip :prop="'websitechannelname'" :label="$t('entities.websitecontent.main_grid.columns.websitechannelname')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'websitechannelname'" :label="$t('entities.websitecontent.main_grid.columns.websitechannelname')" :width="200" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.websitecontent.main_grid.columns.websitechannelname')}}
......@@ -59,18 +59,6 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('websitecontentname')">
<el-table-column show-overflow-tooltip :prop="'websitecontentname'" :label="$t('entities.websitecontent.main_grid.columns.websitecontentname')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.websitecontent.main_grid.columns.websitecontentname')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.websitecontentname}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('contenttype')">
<el-table-column show-overflow-tooltip :prop="'contenttype'" :label="$t('entities.websitecontent.main_grid.columns.contenttype')" :width="100" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
......@@ -85,27 +73,27 @@
</template>
</el-table-column>
</template>
<template v-if="getColumnState('contentcode')">
<el-table-column show-overflow-tooltip :prop="'contentcode'" :label="$t('entities.websitecontent.main_grid.columns.contentcode')" :width="100" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('title')">
<el-table-column show-overflow-tooltip :prop="'title'" :label="$t('entities.websitecontent.main_grid.columns.title')" :width="300" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.websitecontent.main_grid.columns.contentcode')}}
{{$t('entities.websitecontent.main_grid.columns.title')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.contentcode}}</span>
<span>{{row.title}}</span>
</template>
</el-table-column>
</template>
<template v-if="getColumnState('title')">
<el-table-column show-overflow-tooltip :prop="'title'" :label="$t('entities.websitecontent.main_grid.columns.title')" :width="100" :align="'left'" :sortable="'custom'">
<template v-if="getColumnState('contentcode')">
<el-table-column show-overflow-tooltip :prop="'contentcode'" :label="$t('entities.websitecontent.main_grid.columns.contentcode')" :width="150" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.websitecontent.main_grid.columns.title')}}
{{$t('entities.websitecontent.main_grid.columns.contentcode')}}
</span>
</template>
<template v-slot="{row,column,$index}">
<span>{{row.title}}</span>
<span>{{row.contentcode}}</span>
</template>
</el-table-column>
</template>
......
app_WebSite/src/widgets/web-site/main-grid/main-grid.html
浏览文件 @ 33839d8e
......@@ -24,7 +24,7 @@
<el-table-column align="center" type='selection' :width="checkboxColWidth"></el-table-column>
</template>
<template v-if="getColumnState('websitename')">
<el-table-column show-overflow-tooltip :prop="'websitename'" :label="$t('entities.website.main_grid.columns.websitename')" :width="100" :align="'left'" :sortable="'custom'">
<el-table-column show-overflow-tooltip :prop="'websitename'" :label="$t('entities.website.main_grid.columns.websitename')" :width="250" :align="'left'" :sortable="'custom'">
<template v-slot:header="{column}">
<span class="column-header ">
{{$t('entities.website.main_grid.columns.websitename')}}
......
businesscentral-core/src/main/java/cn/ibizlab/businesscentral/core/website/domain/WebSiteChannel.java
浏览文件 @ 33839d8e
......@@ -124,7 +124,7 @@ public class WebSiteChannel extends EntityMP implements Serializable {
@JsonProperty("channeltype")
private String channeltype;
/**
* 频道业务标识
* 业务标识
*/
@TableField(value = "channelcode")
@JSONField(name = "channelcode")
......@@ -203,7 +203,7 @@ public class WebSiteChannel extends EntityMP implements Serializable {
}
/**
* 设置 [频道业务标识]
* 设置 [业务标识]
*/
public void setChannelcode(String channelcode){
this.channelcode = channelcode ;
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或