diff --git a/backend/src/main/java/io/dataease/commons/constants/PanelConstants.java b/backend/src/main/java/io/dataease/commons/constants/PanelConstants.java
index 22b00b9587..9ed597da05 100644
--- a/backend/src/main/java/io/dataease/commons/constants/PanelConstants.java
+++ b/backend/src/main/java/io/dataease/commons/constants/PanelConstants.java
@@ -20,9 +20,9 @@ public class PanelConstants {
public final static String PANEL_NODE_TYPE_PANEL = "panel";
- public final static String OPT_TYPE_INSERT="insert";
+ public final static String OPT_TYPE_INSERT = "insert";
- public final static String OPT_TYPE_UPDATE="update";
+ public final static String OPT_TYPE_UPDATE = "update";
public final static String PANEL_GATHER_DEFAULT_PANEL = "default_panel";
@@ -68,4 +68,16 @@ public class PanelConstants {
}
+
+ //应用数据源来源
+ public static final class APP_DATASOURCE_FROM {
+
+ // 新建
+ public static final String NEW = "new";
+
+ // 复用
+ public static final String HISTORY = "history";
+
+ }
+
}
diff --git a/backend/src/main/java/io/dataease/controller/request/panel/PanelAppTemplateApplyRequest.java b/backend/src/main/java/io/dataease/controller/request/panel/PanelAppTemplateApplyRequest.java
index 77b95aaabe..ec21e369ab 100644
--- a/backend/src/main/java/io/dataease/controller/request/panel/PanelAppTemplateApplyRequest.java
+++ b/backend/src/main/java/io/dataease/controller/request/panel/PanelAppTemplateApplyRequest.java
@@ -29,5 +29,9 @@ public class PanelAppTemplateApplyRequest {
private String appTemplateId;
+ private String datasourceFrom;
+
+ private String datasourceHistoryId;
+
private List datasourceList;
}
diff --git a/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.xml b/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.xml
index ccd96b59a6..1360162dbb 100644
--- a/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.xml
@@ -16,40 +16,42 @@
{{
params &&
- params.id &&
- params.showModel &&
- params.showModel === 'show' &&
- !canEdit
+ params.id &&
+ params.showModel &&
+ params.showModel === 'show' &&
+ !canEdit
? $t('datasource.show_info')
: formType == 'add'
? `${$t('commons.create') + typeMap}${$t('commons.datasource')}`
@@ -132,8 +132,62 @@
/>
+
+ {{
+ positionCheck('appMarket') ? $t('app_template.datasource_info') : $t('datasource.basic_info')
+ }}
+
+
+
+
+
+ {{ $t('app_template.datasource_new') }}
+
+
+ {{ $t('app_template.datasource_history') }}
+
+
+
+
+
+
+
+
+
+
-
- {{
- positionCheck('appMarket') ? $t('app_template.datasource_info') : $t('datasource.basic_info')
- }}
-
+
+
+
+
+ {{ $t('commons.cancel') }}
+
+ {{ $t('commons.save') }}
+
+
+
+