diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts index c8bc3bdff2..3db8c75622 100644 --- a/core/core-frontend/src/locales/en.ts +++ b/core/core-frontend/src/locales/en.ts @@ -2941,6 +2941,7 @@ export default { column_name: 'Field name' }, visualization: { + data_match_type: 'Data match type', select_resource: 'Select {0}', change_screen_page: 'Change {0}', new_screen_page: 'New page', diff --git a/core/core-frontend/src/locales/tw.ts b/core/core-frontend/src/locales/tw.ts index 3753382727..ca8d69c36a 100644 --- a/core/core-frontend/src/locales/tw.ts +++ b/core/core-frontend/src/locales/tw.ts @@ -2860,6 +2860,7 @@ export default { column_name: '欄位名稱' }, visualization: { + data_match_type: '資料匹配方式', select_resource: '請選擇{0}', change_screen_page: '更換{0}', new_screen_page: '新建分頁', diff --git a/core/core-frontend/src/locales/zh-CN.ts b/core/core-frontend/src/locales/zh-CN.ts index 1fa72a7e83..b6e13ac157 100644 --- a/core/core-frontend/src/locales/zh-CN.ts +++ b/core/core-frontend/src/locales/zh-CN.ts @@ -2869,6 +2869,7 @@ export default { column_name: '字段名称' }, visualization: { + data_match_type: '数据匹配方式', select_resource: '请选择{0}', change_screen_page: '更换{0}', new_screen_page: '新建分页', diff --git a/core/core-frontend/src/views/common/DeAppApply.vue b/core/core-frontend/src/views/common/DeAppApply.vue index 38b01984ca..90a8422707 100644 --- a/core/core-frontend/src/views/common/DeAppApply.vue +++ b/core/core-frontend/src/views/common/DeAppApply.vue @@ -8,15 +8,14 @@ :close-on-press-escape="false" size="500px" direction="rtl" - z-index="1000" + :z-index="1000" >
@@ -68,7 +67,6 @@ :data="state.dsTree" :props="state.propsTree" @node-click="dsTreeSelect" - :filter-method="dsTreeFilterMethod" :render-after-expand="false" filterable > @@ -82,10 +80,55 @@ + + + + {{ t('datasource.datasource') }} + {{ t('dataset.datalist') }} + +
{{ t('visualization.datasource_info') }}
- + + + {{ t('visualization.app_datasource') }}{{ t('visualization.sys_datasource') }} + + + + + + + + + + + + + {{ t('visualization.app_datasource') }} @@ -218,7 +260,8 @@ const state = reactive({ pid: '', name: t('visualization.new'), datasetFolderPid: null, - datasetFolderName: null + datasetFolderName: null, + dataType: 'datasource' }, rule: { name: [ @@ -252,6 +295,11 @@ const state = reactive({ message: t('visualization.select_ds_group_folder'), trigger: 'blur' } + ], + dataType: [ + { + required: true + } ] } }) @@ -298,6 +346,7 @@ const dfs = (arr: BusiTreeNode[]) => { const init = params => { state.appApplyDrawer = true state.form = params.base + state.form.dataType = 'datasource' state.appData.datasourceInfo = deepCopy(appData.value?.datasourceInfo) initData() } @@ -384,7 +433,7 @@ defineExpose({ transform: translateY(-50%); height: 14px; width: 2px; - background: var(--ed-color-primary, #3370ff); + background: #3370ff; } } @@ -404,6 +453,10 @@ defineExpose({ font-size: 12px; font-weight: 500; width: 100%; + .head_type { + width: 100%; + margin-bottom: 16px; + } .head { width: 100%; }