From 489d7c27dd24f73444f476dd0cf71d8145a8f626 Mon Sep 17 00:00:00 2001 From: chenos Date: Fri, 26 Mar 2021 10:14:53 +0800 Subject: [PATCH] fix: modify text --- .../src/collections/views_details_v2.ts | 4 +- .../plugin-pages/src/collections/views_v2.ts | 14 +---- packages/plugin-pages/src/views/index.ts | 1 + packages/plugin-pages/src/views/types.ts | 57 +++++++++++++++---- 4 files changed, 52 insertions(+), 24 deletions(-) diff --git a/packages/plugin-pages/src/collections/views_details_v2.ts b/packages/plugin-pages/src/collections/views_details_v2.ts index b59da0859..c046d9efd 100644 --- a/packages/plugin-pages/src/collections/views_details_v2.ts +++ b/packages/plugin-pages/src/collections/views_details_v2.ts @@ -13,7 +13,7 @@ export default { interface: 'string', type: 'string', name: 'title', - title: '标签名称', + title: '标签页名称', component: { type: 'string', }, @@ -23,7 +23,7 @@ export default { type: 'belongsTo', name: 'view', target: 'views_v2', - title: '当前标签页视图', + title: '标签页显示的视图', labelField: 'title', valueField: 'id', multiple: false, diff --git a/packages/plugin-pages/src/collections/views_v2.ts b/packages/plugin-pages/src/collections/views_v2.ts index 0f742ea2d..7b4ae3591 100644 --- a/packages/plugin-pages/src/collections/views_v2.ts +++ b/packages/plugin-pages/src/collections/views_v2.ts @@ -34,16 +34,6 @@ export default { }, developerMode: true, }, - // { - // interface: 'string', - // type: 'string', - // name: 'path', - // title: '路径', - // required: true, - // unique: true, - // createOnly: true, - // developerMode: true, - // }, { interface: 'radio', type: 'string', @@ -51,8 +41,8 @@ export default { title: '数据来源', defaultValue: 'collection', dataSource: [ - { label: '当前数据表', value: 'collection' }, - { label: '相关数据表', value: 'association' }, + { label: '所属数据表', value: 'collection' }, + { label: '所属数据表的相关数据', value: 'association' }, ], linkages: [ { diff --git a/packages/plugin-pages/src/views/index.ts b/packages/plugin-pages/src/views/index.ts index b381f3ac6..a442d434a 100644 --- a/packages/plugin-pages/src/views/index.ts +++ b/packages/plugin-pages/src/views/index.ts @@ -25,6 +25,7 @@ export function getOptions() { key: type, value: type, label: view.title, + disabled: !!view.disabled, }); } return options; diff --git a/packages/plugin-pages/src/views/types.ts b/packages/plugin-pages/src/views/types.ts index 22b32e42f..79f24e1d0 100644 --- a/packages/plugin-pages/src/views/types.ts +++ b/packages/plugin-pages/src/views/types.ts @@ -21,7 +21,7 @@ const actions = { const details = { interface: 'json', type: 'virtual', - title: '详情标签页里要显示的视图', + title: '单条数据页面的标签页和视图', target: 'views_details_v2', component: { type: 'subTable', @@ -31,11 +31,25 @@ const details = { const detailsOpenMode = { interface: 'radio', // type: 'string', - title: '单条数据详情页的打开方式', + title: '单条数据页面的打开方式', required: true, dataSource: [ - { label: '常规页面', value: 'window' }, - { label: '快捷抽屉', value: 'drawer' }, + { + label: '{{ markdown(\'常规页面 点击数据进入独立的页面\') }}', + value: 'window', + style: { + display: 'block', + lineHeight: '32px', + }, + }, + { + label: '{{ markdown(\'快捷抽屉 点击数据不离开当前页面,在右侧抽屉里打开操作界面\') }}', + value: 'drawer', + style: { + display: 'block', + lineHeight: '32px', + }, + }, ], defaultValue: 'drawer', component: { @@ -257,7 +271,7 @@ export const calendar = { interface: 'select', type: 'virtual', title: '开始日期字段', - // required: true, + required: true, component: { type: 'remoteSelect', placeholder: '默认为创建时间字段', @@ -445,11 +459,34 @@ export const wysiwyg = { target: 'dataSourceType', condition: `{{ $self.value && $self.value !== 'wysiwyg' }}`, }, - // { - // type: "value:visible", - // target: 'targetField', - // condition: `{{ $self.value && $self.value !== 'wysiwyg' }}`, - // }, ], }, }; + +export const map = { + title: '地图', + disabled: true, + options: {}, + properties: {}, +}; + +export const chart = { + title: '图表', + disabled: true, + options: {}, + properties: {}, +}; + +export const report = { + title: '报表', + disabled: true, + options: {}, + properties: {}, +}; + +export const aggregate = { + title: '汇总指标', + disabled: true, + options: {}, + properties: {}, +};