From 247e30e34007f62cd1b845b135b243a1cf5b5179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=98=89=E8=B1=AA?=
 <42510293+ziyujiahao@users.noreply.github.com>
Date: Thu, 9 Oct 2025 19:36:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E6=95=B0=E6=8D=AE=E5=8C=B9=E9=85=8D=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=20(#17149)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/locales/en.ts          |  1 +
 core/core-frontend/src/locales/tw.ts          |  1 +
 core/core-frontend/src/locales/zh-CN.ts       |  1 +
 .../src/views/common/DeAppApply.vue           | 64 +++++++++++++++++--
 4 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/locales/en.ts b/core/core-frontend/src/locales/en.ts
index 102bf230b3..77316d84b9 100644
--- a/core/core-frontend/src/locales/en.ts
+++ b/core/core-frontend/src/locales/en.ts
@@ -2929,6 +2929,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 3dade87262..1c92d2bd2e 100644
--- a/core/core-frontend/src/locales/tw.ts
+++ b/core/core-frontend/src/locales/tw.ts
@@ -2848,6 +2848,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 7e84d9d4bc..e87ff9c787 100644
--- a/core/core-frontend/src/locales/zh-CN.ts
+++ b/core/core-frontend/src/locales/zh-CN.ts
@@ -2857,6 +2857,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 88f9891a66..90a8422707 100644
--- a/core/core-frontend/src/views/common/DeAppApply.vue
+++ b/core/core-frontend/src/views/common/DeAppApply.vue
@@ -8,7 +8,7 @@
     :close-on-press-escape="false"
     size="500px"
     direction="rtl"
-    z-index="1000"
+    :z-index="1000"
   >
     <div class="app-export">
       <el-form
@@ -16,7 +16,6 @@
         :model="state.form"
         :rules="state.rule"
         class="de-form-item app-form"
-        size="middle"
         label-width="180px"
         label-position="top"
       >
@@ -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 @@
             </template>
           </el-tree-select>
         </el-form-item>
+        <el-form-item :label="t('visualization.data_match_type')" prop="dataType">
+          <el-radio-group v-model="state.form.dataType">
+            <el-radio size="small" :label="'datasource'">
+              {{ t('datasource.datasource') }}</el-radio
+            >
+            <el-radio size="small" :label="'dataset'">{{ t('dataset.datalist') }} </el-radio>
+          </el-radio-group>
+        </el-form-item>
         <div class="de-row-rules" style="margin: 0 0 16px">
           <span>{{ t('visualization.datasource_info') }}</span>
         </div>
-        <el-row class="datasource-link">
+        <el-row class="datasource-link" v-if="state.form.dataType === 'datasource'">
+          <el-row class="head">
+            <el-col :span="11">{{ t('visualization.app_datasource') }}</el-col
+            ><el-col :span="2"></el-col
+            ><el-col :span="11">{{ t('visualization.sys_datasource') }}</el-col>
+          </el-row>
+          <el-row
+            :key="index"
+            class="content"
+            v-for="(appDatasource, index) in state.appData.datasourceInfo"
+          >
+            <el-col :span="11">
+              <el-select style="width: 100%" v-model="appDatasource.name" disabled>
+                <el-option
+                  :key="appDatasource.name"
+                  :label="appDatasource.name"
+                  :value="appDatasource.name"
+                >
+                </el-option>
+              </el-select> </el-col
+            ><el-col :span="2" class="icon-center">
+              <Icon name="dv-link-target"
+                ><dvLinkTarget class="svg-icon" style="width: 20px; height: 20px" /></Icon></el-col
+            ><el-col :span="11">
+              <dataset-select
+                ref="datasetSelector"
+                v-model="appDatasource.systemDatasourceId"
+                style="flex: 1"
+                :state-obj="state"
+                themes="light"
+                source-type="datasource"
+                @add-ds-window="addDsWindow"
+                view-id="0"
+              />
+            </el-col>
+          </el-row>
+        </el-row>
+        <el-row class="datasource-link" v-if="state.form.dataType === 'dataset'">
           <el-row class="head">
             <el-col :span="11">{{ t('visualization.app_datasource') }}</el-col
             ><el-col :span="2"></el-col
@@ -217,7 +260,8 @@ const state = reactive({
     pid: '',
     name: t('visualization.new'),
     datasetFolderPid: null,
-    datasetFolderName: null
+    datasetFolderName: null,
+    dataType: 'datasource'
   },
   rule: {
     name: [
@@ -251,6 +295,11 @@ const state = reactive({
         message: t('visualization.select_ds_group_folder'),
         trigger: 'blur'
       }
+    ],
+    dataType: [
+      {
+        required: true
+      }
     ]
   }
 })
@@ -297,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()
 }
@@ -403,6 +453,10 @@ defineExpose({
   font-size: 12px;
   font-weight: 500;
   width: 100%;
+  .head_type {
+    width: 100%;
+    margin-bottom: 16px;
+  }
   .head {
     width: 100%;
   }