Merge pull request WeBankFinTech#187 from Kabimon/dev-1.0.0

LGTM
Mu-L · Feb 26, 2022 · 9b1ee51 · 9b1ee51
2 parents 271fb23 + 8fa8613
commit 9b1ee51
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/web/src/pages/dataSourceManage/components/datasourceForm/index.vue b/web/src/pages/dataSourceManage/components/datasourceForm/index.vue
@@ -50,7 +50,8 @@ const typesMap = {
   // dataSource: 'options',
   dataSource: (data, source, self)=>{
     const fApi = self.fApi;
-    if(/^https?:/.test(data.dataSource)){
+    if(typeof data.dataSource === 'string'){
+      ///^https?:/.test(data.dataSource)
       request(data.dataSource, {}, {
         method: "GET",
       }).then(result=>{

diff --git a/web/src/pages/jobManagement/components/dyncRender.vue b/web/src/pages/jobManagement/components/dyncRender.vue
@@ -113,7 +113,13 @@ export default defineComponent({
     let partitionArr = ref([])
     const _buildMap = function () {
       partitionArr.value = []
-      let url = source.split('?')[0]
+      let url
+      const source_reg = new RegExp('^http');
+      if (source_reg.test(source.value)) {
+        url = source.split('?')[0]
+      } else {
+        url = window.location.origin + source.split('?')[0]
+      }
       getPartitionInfo({
         source: url,
         dataSourceId: props.data.id,