Merge remote-tracking branch 'upstream/branch-1.0.2' into 102

6 years ago · 31b809e8a7
7 changed files with 129 additions and 25 deletions
--- a/escheduler-ui/.env
+++ b/escheduler-ui/.env
@ -2,4 +2,4 @@
 API_BASE = http://192.168.xx.xx:12345

 # 本地开发如需ip访问项目把"#"号去掉
-#DEV_HOST = 192.168.xx.xx
+#DEV_HOST = 192.168.xx.xx
--- a/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
+++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue
@ -84,6 +84,8 @@
        desc: '',
        // Global custom parameters
        udpList: [],
+        // Global custom parameters
+        udpListCache: [],
        // Whether to update the process definition
        syncDefine: true,
        // Timeout alarm
@ -159,11 +161,7 @@
       * Close the popup
       */
      close () {
-        // Storage global globalParams
-        this._accuStore()
-        setTimeout(() => {
-          this.$emit('close')
-        })
+        this.$emit('close')
      }
    },
    watch: {
@ -175,11 +173,13 @@
      }
    },
    created () {
-      this.udpList = this.store.state.dag.globalParams
-      this.name = this.store.state.dag.name
-      this.desc = this.store.state.dag.desc
-      this.syncDefine = this.store.state.dag.syncDefine
-      this.timeout = this.store.state.dag.timeout || 0
+      const dag = _.cloneDeep(this.store.state.dag)
+      this.udpList = dag.globalParams
+      this.udpListCache = dag.globalParams
+      this.name = dag.name
+      this.desc = dag.desc
+      this.syncDefine = dag.syncDefine
+      this.timeout = dag.timeout || 0
      this.checkedTimeout = this.timeout !== 0
    },
    mounted () {},
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@ -32,7 +32,7 @@
          </th>
        </tr>
        <tr v-for="(item, $index) in list" :key="item.id">
-          <td width="50"><x-checkbox v-model="item.isCheck" @on-change="_arrDelChange"></x-checkbox></td>
+          <td width="50"><x-checkbox v-model="item.isCheck" :disabled="item.releaseState === 'ONLINE'" @on-change="_arrDelChange"></x-checkbox></td>
          <td width="50">
            <span>{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}</span>
          </td>
@ -53,16 +53,16 @@
          </td>
          <td><span class="ellipsis">{{item.desc}}</span></td>
          <td>
-            <span v-if="item.scheduleReleaseState === 'OFFLINE'">{{$t('offline')}}</span>
-            <span v-if="item.scheduleReleaseState === 'ONLINE'">{{$t('online')}}</span>
+            <span v-if="item.scheduleReleaseState === 'OFFLINE'">{{$t('online')}}</span>
+            <span v-if="item.scheduleReleaseState === 'ONLINE'">{{$t('offline')}}</span>
            <span v-if="!item.scheduleReleaseState">-</span>
          </td>
          <td>
            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Edit')" @click="_edit(item)" :disabled="item.releaseState === 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-bianji"><!--{{$t('编辑')}}--></x-button>
            <x-button type="success" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Start')" @click="_start(item)" :disabled="item.releaseState !== 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-qidong"><!--{{$t('启动')}}--></x-button>
            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Timing')" @click="_timing(item)" :disabled="item.releaseState !== 'ONLINE' || item.scheduleReleaseState !== null" v-ps="['GENERAL_USER']" icon="iconfont icon-timer"><!--{{$t('定时')}}--></x-button>
-            <x-button type="error" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('offline')" @click="_downline(item)" v-if="item.releaseState === 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-erji-xiaxianjilu"><!--{{$t('下线')}}--></x-button>
-            <x-button type="warning" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('online')" @click="_poponline(item)" v-if="item.releaseState === 'OFFLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-erji-xiaxianjilu-copy"><!--{{$t('上线')}}--></x-button>
+            <x-button type="warning" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('online')" @click="_poponline(item)" v-if="item.releaseState === 'OFFLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-erji-xiaxianjilu-copy"><!--{{$t('下线')}}--></x-button>
+            <x-button type="error" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('offline')" @click="_downline(item)" v-if="item.releaseState === 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-erji-xiaxianjilu"><!--{{$t('上线')}}--></x-button>
            <x-button type="info" shape="circle" size="xsmall" data-toggle="tooltip" :title="$t('Cron Manage')" @click="_timingManage(item)" :disabled="item.releaseState !== 'ONLINE'" v-ps="['GENERAL_USER']" icon="iconfont icon-paibanguanli"><!--{{$t('定时管理')}}--></x-button>
            <x-poptip
              :ref="'poptip-delete-' + $index"
@ -79,6 +79,7 @@
                  type="error"
                  shape="circle"
                  size="xsmall"
+                  :disabled="item.releaseState === 'ONLINE'"
                  data-toggle="tooltip"
                  :title="$t('delete')"
                  v-ps="['GENERAL_USER']">
@ -90,7 +91,21 @@
        </tr>
      </table>
    </div>
-    <x-button size="xsmall" style="position: absolute; bottom: -48px; left: 22px;" v-if="strDelete !== ''" @click="_batchDelete">删除</x-button>
+    <x-poptip
+            v-show="strDelete !== ''"
+            ref="poptipDeleteAll"
+            placement="bottom-start"
+            width="90">
+      <p>{{$t('Delete?')}}</p>
+      <div style="text-align: right; margin: 0;padding-top: 4px;">
+        <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete(-1)">{{$t('Cancel')}}</x-button>
+        <x-button type="primary" size="xsmall" shape="circle" @click="_delete({},-1)">{{$t('Confirm')}}</x-button>
+      </div>
+      <template slot="reference">
+        <x-button size="xsmall" style="position: absolute; bottom: -48px; left: 22px;" >删除</x-button>
+      </template>
+    </x-poptip>
+
  </div>
 </template>
 <script>
@ -211,12 +226,22 @@
       * Close the delete layer
       */
      _closeDelete (i) {
-        this.$refs[`poptip-delete-${i}`][0].doClose()
+        if (i > 0) {
+          this.$refs[`poptip-delete-${i}`][0].doClose()
+        }else{
+          this.$refs['poptipDeleteAll'].doClose()
+        }
      },
      /**
       * delete
       */
      _delete (item, i) {
+        // remove tow++
+        if (i < 0) {
+          this._batchDelete()
+          return
+        }
+        // remove one
        this.deleteDefinition({
          processDefinitionId: item.id
        }).then(res => {
@ -272,7 +297,7 @@
       */
      _topCheckBoxClick (v) {
        this.list.forEach((item, i) => {
-          this.$set(this.list[i], 'isCheck', v)
+          this.$set(this.list[i], 'isCheck', item.releaseState !== 'OFFLINE' ? v : false)
        })
        this._arrDelChange()
      },
@ -295,6 +320,7 @@
       * batch delete
       */
      _batchDelete () {
+        this.$refs['poptipDeleteAll'].doClose()
        this.batchDeleteDefinition({
          processDefinitionIds: this.strDelete
        }).then(res => {
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/timing/_source/list.vue
@ -35,7 +35,7 @@
              <th>
                <span>{{$t('Update Time')}}</span>
              </th>
-              <th width="80">
+              <th width="120">
                <span>{{$t('Operation')}}</span>
              </th>
            </tr>
@ -98,6 +98,28 @@
                        @click="_offline(item)"
                        v-if="item.releaseState === 'ONLINE'">
                </x-button>
+                <x-poptip
+                        :ref="'poptip-delete-' + $index"
+                        placement="bottom-end"
+                        width="90">
+                  <p>{{$t('Delete?')}}</p>
+                  <div style="text-align: right; margin: 0;padding-top: 4px;">
+                    <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete($index)">{{$t('Cancel')}}</x-button>
+                    <x-button type="primary" size="xsmall" shape="circle" @click="_delete(item,$index)">{{$t('Confirm')}}</x-button>
+                  </div>
+                  <template slot="reference">
+                    <x-button
+                            icon="iconfont icon-shanchu"
+                            type="error"
+                            shape="circle"
+                            size="xsmall"
+                            :disabled="item.releaseState === 'ONLINE'"
+                            data-toggle="tooltip"
+                            :title="$t('delete')"
+                            v-ps="['GENERAL_USER']">
+                    </x-button>
+                  </template>
+                </x-poptip>
              </td>
            </tr>
          </table>
@ -135,7 +157,28 @@
    props: {
    },
    methods: {
-      ...mapActions('dag', ['getScheduleList', 'scheduleOffline', 'scheduleOnline', 'getReceiver']),
+      ...mapActions('dag', ['getScheduleList', 'scheduleOffline', 'scheduleOnline', 'getReceiver','deleteTiming']),
+      /**
+       * delete
+       */
+      _delete (item, i) {
+        this.deleteTiming({
+          scheduleId: item.id
+        }).then(res => {
+          this.$refs[`poptip-delete-${i}`][0].doClose()
+          this.$message.success(res.msg)
+          this.$router.push({ name: 'projects-definition-list' })
+        }).catch(e => {
+          this.$refs[`poptip-delete-${i}`][0].doClose()
+          this.$message.error(e.msg || '')
+        })
+      },
+      /**
+       * Close the delete layer
+       */
+      _closeDelete (i) {
+        this.$refs[`poptip-delete-${i}`][0].doClose()
+      },
      /**
       * return state
       */
--- a/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@ -249,7 +249,20 @@
        </tr>
      </table>
    </div>
-    <x-button size="xsmall" style="position: absolute; bottom: -48px; left: 22px;" v-if="strDelete !== ''" @click="_batchDelete">删除</x-button>
+    <x-poptip
+            v-show="strDelete !== ''"
+            ref="poptipDeleteAll"
+            placement="bottom-start"
+            width="90">
+      <p>{{$t('Delete?')}}</p>
+      <div style="text-align: right; margin: 0;padding-top: 4px;">
+        <x-button type="text" size="xsmall" shape="circle" @click="_closeDelete(-1)">{{$t('Cancel')}}</x-button>
+        <x-button type="primary" size="xsmall" shape="circle" @click="_delete({},-1)">{{$t('Confirm')}}</x-button>
+      </div>
+      <template slot="reference">
+        <x-button size="xsmall" style="position: absolute; bottom: -48px; left: 22px;" >删除</x-button>
+      </template>
+    </x-poptip>
  </div>
 </template>
 <script>
@ -293,12 +306,22 @@
       * Close the delete layer
       */
      _closeDelete (i) {
-        this.$refs[`poptip-delete-${i}`][0].doClose()
+        if (i > 0) {
+          this.$refs[`poptip-delete-${i}`][0].doClose()
+        }else{
+          this.$refs['poptipDeleteAll'].doClose()
+        }
      },
      /**
       * delete
       */
      _delete (item, i) {
+        // remove tow++
+        if (i < 0) {
+          this._batchDelete()
+          return
+        }
+        // remove one
        this.deleteInstance({
          processInstanceId: item.id
        }).then(res => {
@ -467,6 +490,7 @@
        }
      },
      _batchDelete () {
+        this.$refs['poptipDeleteAll'].doClose()
        this.batchDeleteInstance({
          processInstanceIds: this.strDelete
        }).then(res => {
--- a/escheduler-ui/src/js/conf/home/store/dag/actions.js
+++ b/escheduler-ui/src/js/conf/home/store/dag/actions.js
@ -589,5 +589,17 @@ export default {
        reject(e)
      })
    })
+  },
+  /**
+   * remove timing
+   */
+  deleteTiming({ state }, payload){
+    return new Promise((resolve, reject) => {
+      io.get(`projects/${state.projectName}/schedule/delete`, payload, res => {
+        resolve(res)
+      }).catch(e => {
+        reject(e)
+      })
+    })
  }
 }
--- a/install.sh
+++ b/install.sh
@ -408,8 +408,7 @@ if [ "true" = $monitorServerState ];then
                echo "monitor server running as process ${TARGET_PID}.Stopped success"
                rm -f $monitor_pid
        fi
-        nohup python -u ${workDir}/script/monitor_server.py $installPath $zkQuorum $zkMasters $zkWorkers > ${workDir}/monitor_server
-.log 2>&1 &
+        nohup python -u ${workDir}/script/monitor_server.py $installPath $zkQuorum $zkMasters $zkWorkers > ${workDir}/monitor_server.log 2>&1 &
        echo $! > $monitor_pid
        echo "start monitor server success as process `cat $monitor_pid`"