From 4b962a4d62bab5368e086f984f3544b3f632a1ed Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 16 Jul 2024 10:48:26 +0800
Subject: [PATCH 1/4] =?UTF-8?q?refactor:=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 de-xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/de-xpack b/de-xpack
index 5e9ea291de..d5537b40bc 160000
--- a/de-xpack
+++ b/de-xpack
@@ -1 +1 @@
-Subproject commit 5e9ea291de63ba42144f55ce2aba43abf6f9d906
+Subproject commit d5537b40bc950fe703b3b726762b34b3f1f57474

From 83430266c84d529f9641019ef9eeb6a2bcce39c1 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 16 Jul 2024 10:49:39 +0800
Subject: [PATCH 2/4] =?UTF-8?q?refactor:=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visualized/data/datasource/form/index.vue | 23 ++++++++++++
 .../xpack/component/XpackComponentApi.java    |  4 ++
 .../datasource/factory/ProviderFactory.java   | 37 ++++++++++++++++++-
 .../plugin/DataEaseDatasourcePlugin.java      | 33 +++++++++++++++++
 .../vo/XpackPluginsDatasourceVO.java          | 28 ++++++++++++++
 5 files changed, 124 insertions(+), 1 deletion(-)
 create mode 100644 sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/plugin/DataEaseDatasourcePlugin.java
 create mode 100644 sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/XpackPluginsDatasourceVO.java

diff --git a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
index 79a3500da5..b662c737b9 100644
--- a/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
+++ b/core/core-frontend/src/views/visualized/data/datasource/form/index.vue
@@ -135,6 +135,25 @@ const getDatasourceTypes = () => {
   })
 }
 getDatasourceTypes()
+const loadDsPlugin = data => {
+  data.forEach(item => {
+    const { name, category, type, icon, extraParams, staticMap } = item
+    const node = {
+      name,
+      category,
+      type,
+      icon,
+      extraParams,
+      isPlugin: true,
+      staticMap
+    }
+
+    const index = typeList.findIndex(ele => ele === node.catalog)
+    if (index !== -1) {
+      databaseList[index].push(node)
+    }
+  })
+}
 
 const getLatestUseTypes = () => {
   latestUse({}).then(res => {
@@ -726,6 +745,10 @@ defineExpose({
     @finish="complete"
     ref="creatDsFolder"
   ></creat-ds-group>
+  <XpackComponent
+    jsname="L2NvbXBvbmVudC9wbHVnaW5zLWhhbmRsZXIvRHNDYXRlZ29yeUhhbmRsZXI="
+    @load-ds-plugin="loadDsPlugin"
+  />
 </template>
 
 <style lang="less">
diff --git a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/component/XpackComponentApi.java b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/component/XpackComponentApi.java
index 5fedf5af93..e3ddecc85e 100644
--- a/sdk/api/api-base/src/main/java/io/dataease/api/xpack/component/XpackComponentApi.java
+++ b/sdk/api/api-base/src/main/java/io/dataease/api/xpack/component/XpackComponentApi.java
@@ -1,6 +1,7 @@
 package io.dataease.api.xpack.component;
 
 import io.dataease.api.xpack.component.vo.XpackMenuVO;
+import io.dataease.extensions.datasource.vo.XpackPluginsDatasourceVO;
 import io.dataease.extensions.view.vo.XpackPluginsViewVO;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -21,6 +22,9 @@ public interface XpackComponentApi {
     @GetMapping("/viewPlugins")
     List<XpackPluginsViewVO> viewPlugins();
 
+    @GetMapping("/dsPlugins")
+    List<XpackPluginsDatasourceVO> dsPlugins();
+
     @GetMapping("/pluginStaticInfo/{moduleName}")
     void pluginStaticInfo(@PathVariable("moduleName") String moduleName);
 }
diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/factory/ProviderFactory.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/factory/ProviderFactory.java
index 353972f5d6..029c0ca474 100644
--- a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/factory/ProviderFactory.java
+++ b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/factory/ProviderFactory.java
@@ -1,11 +1,19 @@
 package io.dataease.extensions.datasource.factory;
 
+import io.dataease.exception.DEException;
+import io.dataease.extensions.datasource.plugin.DataEaseDatasourcePlugin;
 import io.dataease.extensions.datasource.provider.Provider;
 import io.dataease.extensions.datasource.utils.SpringContextUtil;
 import io.dataease.extensions.datasource.vo.DatasourceConfiguration;
+import io.dataease.extensions.datasource.vo.XpackPluginsDatasourceVO;
+import io.dataease.license.utils.LicenseUtil;
+import io.dataease.license.utils.LogUtil;
+import io.dataease.plugins.factory.DataEasePluginFactory;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * @Author Junjun
@@ -17,11 +25,38 @@ public class ProviderFactory {
         if (list.contains(type)) {
             return SpringContextUtil.getApplicationContext().getBean("calciteProvider", Provider.class);
         }
-        return SpringContextUtil.getApplicationContext().getBean(type + "DsProvider", Provider.class);
+        return getInstance(type);
     }
 
     public static Provider getDefaultProvider() {
         return SpringContextUtil.getApplicationContext().getBean("calciteProvider", Provider.class);
     }
 
+
+    private static final Map<String, DataEaseDatasourcePlugin> templateMap = new ConcurrentHashMap<>();
+
+    public static Provider getInstance(String type) {
+        if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用！");
+        String key = type;
+        return templateMap.get(key);
+    }
+
+    public static void loadPlugin(String type, DataEaseDatasourcePlugin plugin) {
+        if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用！");
+        String key = type;
+        if (templateMap.containsKey(key)) return;
+        templateMap.put(key, plugin);
+        try {
+            String moduleName = plugin.getPluginInfo().getModuleName();
+            DataEasePluginFactory.loadTemplate(moduleName, plugin);
+        } catch (Exception e) {
+            LogUtil.error(e.getMessage(), new Throwable(e));
+            DEException.throwException(e);
+        }
+    }
+
+    public static List<XpackPluginsDatasourceVO> getDsConfigList() {
+        if (!LicenseUtil.licenseValid()) DEException.throwException("插件功能只对企业版本可用！");
+        return templateMap.values().stream().map(DataEaseDatasourcePlugin::getConfig).toList();
+    }
 }
diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/plugin/DataEaseDatasourcePlugin.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/plugin/DataEaseDatasourcePlugin.java
new file mode 100644
index 0000000000..7eac716a7a
--- /dev/null
+++ b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/plugin/DataEaseDatasourcePlugin.java
@@ -0,0 +1,33 @@
+package io.dataease.extensions.datasource.plugin;
+
+import io.dataease.exception.DEException;
+import io.dataease.extensions.datasource.factory.ProviderFactory;
+import io.dataease.extensions.datasource.provider.Provider;
+import io.dataease.extensions.datasource.vo.XpackPluginsDatasourceVO;
+import io.dataease.license.utils.JsonUtil;
+import io.dataease.plugins.template.DataEasePlugin;
+import io.dataease.plugins.vo.DataEasePluginVO;
+
+/**
+ * @Author Junjun
+ */
+public abstract class DataEaseDatasourcePlugin extends Provider implements DataEasePlugin {
+    @Override
+    public void loadPlugin() {
+        XpackPluginsDatasourceVO datasourceConfig = getConfig();
+        ProviderFactory.loadPlugin(datasourceConfig.getType(), this);
+    }
+
+    public XpackPluginsDatasourceVO getConfig() {
+        DataEasePluginVO pluginInfo = null;
+        try {
+            pluginInfo = getPluginInfo();
+        } catch (Exception e) {
+            DEException.throwException(e);
+        }
+        String config = pluginInfo.getConfig();
+        XpackPluginsDatasourceVO vo = JsonUtil.parseObject(config, XpackPluginsDatasourceVO.class);
+        vo.setIcon(pluginInfo.getIcon());
+        return vo;
+    }
+}
diff --git a/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/XpackPluginsDatasourceVO.java b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/XpackPluginsDatasourceVO.java
new file mode 100644
index 0000000000..9c113aab6c
--- /dev/null
+++ b/sdk/extensions/extensions-datasource/src/main/java/io/dataease/extensions/datasource/vo/XpackPluginsDatasourceVO.java
@@ -0,0 +1,28 @@
+package io.dataease.extensions.datasource.vo;
+
+import lombok.Data;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Map;
+
+@Data
+public class XpackPluginsDatasourceVO implements Serializable {
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private String name;
+
+    private String icon;
+
+    private String category;
+
+    private String type;
+
+    private String extraParams;
+
+    private Map<String, String> staticMap;
+
+}

From 294760e8c3675081e0d4fb948fbfd5333839619d Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 16 Jul 2024 10:51:55 +0800
Subject: [PATCH 3/4] =?UTF-8?q?fix(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):?=
 =?UTF-8?q?=20v2.8=20=E6=96=87=E6=9C=AC=E6=90=9C=E7=B4=A2=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E5=90=8C=E6=97=B6=E8=AE=BE=E7=BD=AE=E5=BF=85=E5=A1=AB=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E8=AF=86=E5=88=AB=E9=BB=98=E8=AE=A4=E5=80=BC?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E6=97=A0=E9=80=89=E9=A1=B9=E5=80=BC=20#10853?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/v-query/Component.vue       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue
index 36fbdfa107..a036a0bfef 100644
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@@ -423,7 +423,17 @@ const queryData = () => {
         requiredName = next.name
       }
 
-      if (
+      if (next.displayType === '8') {
+        const { conditionValueF, conditionValueS, conditionType } = next
+        if (conditionType === 0) {
+          requiredName = conditionValueF === '' ? next.name : ''
+        } else {
+          requiredName = [conditionValueF || '', conditionValueS || ''].filter(ele => ele !== '')
+            .length
+            ? next.name
+            : ''
+        }
+      } else if (
         (Array.isArray(next.selectValue) && !next.selectValue.length) ||
         (next.selectValue !== 0 && !next.selectValue)
       ) {

From 71b782d96d1d5adb845d5e323093cec340fdb6d8 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Tue, 16 Jul 2024 11:45:08 +0800
Subject: [PATCH 4/4] =?UTF-8?q?feat(=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6):?=
 =?UTF-8?q?=20=E4=B8=8B=E6=8B=89=E7=BB=84=E4=BB=B6=E7=9A=84=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E9=80=89=E6=8B=A9=E5=B1=95=E7=A4=BA=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E5=92=8C=E9=BB=98=E8=AE=A4=E4=B8=A4=E7=A7=8D?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=20#10770?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/api/dataset.ts                     | 1 +
 .../v-query/QueryConditionConfiguration.vue               | 8 ++++++++
 .../core-frontend/src/custom-component/v-query/Select.vue | 8 +++++++-
 core/core-frontend/src/custom-component/v-query/Tree.vue  | 7 ++++++-
 4 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/core/core-frontend/src/api/dataset.ts b/core/core-frontend/src/api/dataset.ts
index 796cf88402..d8b5c469fd 100644
--- a/core/core-frontend/src/api/dataset.ts
+++ b/core/core-frontend/src/api/dataset.ts
@@ -16,6 +16,7 @@ export interface EnumValue {
   displayId?: string
   sortId?: string
   sort?: string
+  resultMode?: number
   searchText: string
   filter?: Array<{}>
 }
diff --git a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
index dae6c1674e..9d4e98f5e3 100644
--- a/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
+++ b/core/core-frontend/src/custom-component/v-query/QueryConditionConfiguration.vue
@@ -922,6 +922,7 @@ const parameterCompletion = () => {
     conditionValueF: '',
     conditionValueOperatorS: 'like',
     conditionValueS: '',
+    resultMode: 0,
     defaultConditionValueOperatorF: 'eq',
     defaultConditionValueF: '',
     defaultConditionValueOperatorS: 'like',
@@ -1850,6 +1851,13 @@ defineExpose({
                 </div>
               </div>
             </div>
+            <div class="label">选项值数量</div>
+            <div class="value">
+              <el-radio-group v-model="curComponent.resultMode">
+                <el-radio :label="0">默认</el-radio>
+                <el-radio :label="1">全部</el-radio>
+              </el-radio-group>
+            </div>
           </div>
           <div class="list-item top-item" v-if="curComponent.displayType === '8'">
             <div class="label">条件类型</div>
diff --git a/core/core-frontend/src/custom-component/v-query/Select.vue b/core/core-frontend/src/custom-component/v-query/Select.vue
index 4ae900a494..f0728dfaf8 100644
--- a/core/core-frontend/src/custom-component/v-query/Select.vue
+++ b/core/core-frontend/src/custom-component/v-query/Select.vue
@@ -25,6 +25,7 @@ interface SelectConfig {
   displayType: string
   showEmpty: boolean
   id: string
+  resultMode: number
   displayId: string
   sort: string
   sortId: string
@@ -50,6 +51,7 @@ const props = defineProps({
     default: () => {
       return {
         selectValue: '',
+        resultMode: 0,
         defaultValue: '',
         displayType: '',
         defaultValueCheck: false,
@@ -219,7 +221,10 @@ const displayTypeChange = () => {
 
 const handleFieldIdDefaultChange = (val: string[]) => {
   loading.value = true
-  getEnumValue(val)
+  getEnumValue({
+    fieldIds: val,
+    resultMode: config.value.resultMode || 0
+  })
     .then(res => {
       options.value = (res || [])
         .filter(ele => ele !== null)
@@ -501,6 +506,7 @@ const setOptions = (num: number) => {
           displayId: displayId || field.id,
           sort,
           sortId,
+          resultMode: config.value.resultMode || 0,
           searchText: searchText.value,
           filter: getCascadeFieldId()
         })
diff --git a/core/core-frontend/src/custom-component/v-query/Tree.vue b/core/core-frontend/src/custom-component/v-query/Tree.vue
index 0b29fb690c..79d255a21a 100644
--- a/core/core-frontend/src/custom-component/v-query/Tree.vue
+++ b/core/core-frontend/src/custom-component/v-query/Tree.vue
@@ -16,6 +16,7 @@ interface SelectConfig {
   selectValue: any
   defaultMapValue: any
   defaultValue: any
+  resultMode: number
   checkedFieldsMap: object
   displayType: string
   id: string
@@ -39,6 +40,7 @@ const props = defineProps({
         selectValue: '',
         defaultValue: '',
         displayType: '',
+        resultMode: 0,
         defaultValueCheck: false,
         multiple: false,
         checkedFieldsMap: {},
@@ -176,7 +178,10 @@ const loading = ref(false)
 
 const getTreeOption = debounce(() => {
   loading.value = true
-  getFieldTree(props.config.treeFieldList.map(ele => ele.id))
+  getFieldTree({
+    fieldIds: props.config.treeFieldList.map(ele => ele.id),
+    resultMode: config.value.resultMode || 0
+  })
     .then(res => {
       treeOptionList.value = dfs(res)
     })