Browse Source

Repair bug #901,#909,#935 (#952)

* package

* 修改工作流实例页面状态为运行时,禁止删除,删除package.json包里面的babel-runtime和jasmine-core

* bugfix-user-specified queue takes precedence over tenant queue (#769)

Solve the problem that the user queue setting does not take effect

* update markdown docs which can not display images normally (#806)

* issue#728 (#746)

The mailSender in PasswordAuthentication() and setFrom() may not be the same in actual use, and it's best to set it up separately. please add a example about this.

* install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler (#812)

* service start exception modify

* master,worker start modify

* .env update

* install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler

* scripts name standardization (#813)

* service start exception modify

* master,worker start modify

* .env update

* install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler

* scripts name standardization

* [BUG][#731]repair swagger annotation,interface path:/escheduler/projects/{projectName}/process/batch-delete and /escheduler/projects/{projectName}/process/delete  (#764)

* 增加工作流导出导入功能,前端定时器表达式的秒和分钟的默认值从*修改成0

* 修改工作流导出导入功能由excel改为json减少依赖

* [BUG][#731]repair swagger annotation ,interface path:/escheduler/projects/{projectName}/process/batch-delete and /escheduler/projects/{projectName}/process/delete

* [BUG][#771] The edit timer did not assign the original data

* [FEATURE][#236] Cross-project dependency

* [FEATURE][#236] Cross-project dependency(增加跨项目依赖)

* misspell  words (#817)

* (Docs): Fixed some typo errors (#811)

* Update EasyScheduler Proposal.md

* Update frontend-deployment.md

* Update frontend-development.md

* Update 前端开发文档.md

* Update system-manual.md

* Update HttpClientTest.java

* Update 系统使用手册.md

* fix singleton with volatile (#818)

* Replace StringBuffer with StringBuilder inside the method (#816)

* flink task support(flink 任务支持) (#711)

* flink任务支持

* flink任务支持

* Update zh_CN.js

* Update FlinkArgsUtils.java

* Update .escheduler_env.sh

* 1.Delete the page section console.log;
2.Change project name;
3.Production configuration packaging clears console.log

* Delete the'babel-plugin-transform-remove-console'dependency package

* 1.repair [BUG]#884,2.Add Scheduling Time Fields to Workflow Instance List,3.Add a reminder for empty data

* 1.update logo 2.Workflow Definition Page Timing Component Replaced with Source Code

* epair bug #901,#909,#935
break60 5 years ago
parent
commit
6135a6ad16

+ 5 - 1
escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue

@@ -371,7 +371,11 @@
         this.sqlType = o.params.sqlType
         this.connParams = o.params.connParams || ''
         this.localParams = o.params.localParams || []
-        this.showType = o.params.showType.split(',') || []
+        if(o.params.showType == '') {
+          this.showType = []
+        } else {
+          this.showType = o.params.showType.split(',') || []
+        }
         this.preStatements = o.params.preStatements || []
         this.postStatements = o.params.postStatements || []
         this.title = o.params.title || ''

+ 8 - 2
escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue

@@ -113,7 +113,7 @@
           </template>
         </m-list-box-f>
         <m-list-box-f>
-          <template slot="name"><b>*</b>{{$t('Database Name')}}</template>
+          <template slot="name"><b :class="{hidden:showdDatabase}">*</b>{{$t('Database Name')}}</template>
           <template slot="content">
             <x-input
                     type="input"
@@ -181,6 +181,7 @@
         // btn test loading
         testLoading: false,
         showPrincipal: true,
+        showdDatabase: false,
         isShowPrincipal:true
       }
     },
@@ -280,7 +281,7 @@
           return false
         }
 
-        if (!this.database) {
+        if (!this.database && this.showdDatabase == false) {
           this.$message.warning(`${i18n.$t('Please enter database name')}`)
           return false
         }
@@ -339,6 +340,11 @@
         }else{
           this.showPrincipal = true
         }
+        if(value == 'POSTGRESQL') {
+          this.showdDatabase = true;
+        } else {
+          this.showdDatabase = false;
+        }
       }
     },
     created () {

+ 1 - 1
escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue

@@ -50,7 +50,7 @@
           </td>
           <td>
             <span class="ellipsis">
-              <a href="javascript:" class="links">{{item.name}}</a>
+              {{item.name}}
             </span>
           </td>
           <td>

+ 1 - 2
escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/_source/zookeeperList.vue

@@ -64,8 +64,7 @@
             <span>{{$index + 1}}</span>
           </td>
           <td>
-            <span>
-              <a href="javascript:" class="links">{{item.hostname}}</a>
+            <span>{{item.hostname}}
             </span>
           </td>
           <td><span>{{item.connections}}</span></td>

+ 1 - 1
escheduler-ui/src/js/conf/home/pages/monitor/pages/servers/statistics.vue

@@ -80,7 +80,7 @@
         isLoading: false,
         queueCount: {},
         commandCountData: {},
-        color: themeData.color
+        color: themeData.color,
       }
     },
     props:{},

+ 1 - 1
escheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue

@@ -61,7 +61,7 @@
             <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
           </td>
           <td>
-            <span class="ellipsis"><a href="javascript:" class="links">{{item.name}}</a></span>
+            <span class="ellipsis">{{item.name}}</span>
           </td>
           <td><a href="javascript:" class="links" @click="_go(item)"><span class="ellipsis">{{item.processInstanceName}}</span></a></td>
           <td><span>{{item.taskType}}</span></td>

+ 0 - 4
escheduler-ui/src/js/conf/home/pages/security/pages/queue/_source/list.vue

@@ -44,16 +44,12 @@
           </td>
           <td>
             <span>
-              <a href="javascript:" class="links">
                 {{item.queueName}}
-              </a>
             </span>
           </td>
           <td>
             <span>
-              <a href="javascript:" class="links">
                 {{item.queue}}
-              </a>
             </span>
           </td>
           <td>

+ 0 - 4
escheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue

@@ -50,16 +50,12 @@
           </td>
           <td>
             <span>
-              <a href="javascript:" class="links">
                 {{item.tenantCode}}
-              </a>
             </span>
           </td>
           <td>
             <span>
-              <a href="javascript:" class="links">
                 {{item.tenantName}}
-              </a>
             </span>
           </td>
           <td>

+ 1 - 1
escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/list.vue

@@ -57,7 +57,7 @@
           </td>
           <td>
             <span>
-              <a href="javascript:" class="links">{{item.userName || '-'}}</a>
+              {{item.userName || '-'}}
             </span>
           </td>
           <td>

+ 1 - 2
escheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue

@@ -46,8 +46,7 @@
             <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
           </td>
           <td>
-            <span>
-              <a href="javascript:" class="links">{{item.groupName}}</a>
+            <span>{{item.groupName}}
             </span>
           </td>
           <td><span>{{item.groupType === 'EMAIL' ? `${$t('Email')}` : `${$t('SMS')}`}}</span></td>

+ 1 - 2
escheduler-ui/src/js/conf/home/pages/security/pages/workerGroups/_source/list.vue

@@ -43,8 +43,7 @@
             <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
           </td>
           <td>
-            <span>
-              <a href="javascript:" class="links">{{item.name}}</a>
+            <span>{{item.name}}
             </span>
           </td>
           <td>

+ 1 - 2
escheduler-ui/src/js/conf/home/pages/user/pages/token/_source/list.vue

@@ -46,8 +46,7 @@
             <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
           </td>
           <td>
-            <span>
-              <a href="javascript:" class="links">{{item.userName}}</a>
+            <span>{{item.userName}}
             </span>
           </td>
           <td><span>{{item.token}}</span></td>