edit ico

escheduler-ui/src/font/demo_index.html

@@ -252,6 +252,12 @@
                 <div class="code-name">&amp;#xe60c;</div>
               </li>
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe63e;</span>
+                <div class="name">icon_禁止</div>
+                <div class="code-name">&amp;#xe63e;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe6af;</span>
                 <div class="name">1116加载中</div>
@@ -881,6 +887,15 @@
             </div>
           </li>
           
+          <li class="dib">
+            <span class="icon iconfont icon-icon_jinzhi"></span>
+            <div class="name">
+              icon_禁止
+            </div>
+            <div class="code-name">.icon-icon_jinzhi
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-jiazaizhong"></span>
             <div class="name">
@@ -1575,6 +1590,14 @@
                 <div class="code-name">#icon-tuichufffpx</div>
             </li>
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-icon_jinzhi"></use>
+                </svg>
+                <div class="name">icon_禁止</div>
+                <div class="code-name">#icon-icon_jinzhi</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-jiazaizhong"></use>

escheduler-ui/src/font/iconfont.svg

@@ -131,6 +131,9 @@ Created by iconfont
     <glyph glyph-name="tuichufffpx" unicode="&#58892;" d="M693.23046875 14.5078125zM145.3203125 14.5078125zM870.68164063 777.75zM493.98242187-9.75C301.4140625-9.75 145.3203125 146.34375 145.3203125 338.91210937000005c0 145.72265625 89.47265625 270.61523438 216.38671875 322.64648438v-0.08789063c3.77929688 1.31835938 7.82226563 2.02148438 12.04101563 2.02148438 19.86328125 0 36.12304688-16.171875 36.12304687-36.03515625 0-15.64453125-10.01953125-29.09179688-24.08203125-34.01367188-98.87695313-42.09960938-168.31054688-140.18554688-168.31054688-254.53124999 0-152.75390625 123.75-276.50390625 276.50390626-276.50390626S770.48632813 186.24609375 770.48632813 338.91210937000005c0 114.2578125-69.34570313 212.43164063-168.31054688 254.53125001-14.0625 4.921875-23.99414063 18.36914063-23.99414063 34.01367187 0 19.95117188 16.08398438 36.03515625 36.03515626 36.03515625 4.21875 0 8.17382813-0.703125 12.04101562-2.02148438v0.08789063c127.00195313-52.11914063 216.38671875-176.92382813 216.38671875-322.64648438 0-192.56835938-156.09375-348.66210938-348.66210938-348.66210937z m1e-8 372.65625c-19.86328125 0-36.03515625 16.171875-36.03515625 36.12304688V723.69726563c0 19.86328125 16.171875 36.03515625 36.03515625 36.03515624 19.95117188 0 36.03515625-16.171875 36.03515625-36.03515625V399.1171875c0-20.0390625-16.08398438-36.2109375-36.03515625-36.2109375z"  horiz-adv-x="1024" />
 
     
+    <glyph glyph-name="icon_jinzhi" unicode="&#58942;" d="M512.26367188 777.57421875c-217.44140625 0-393.75-176.30859375-393.75000001-393.75s176.30859375-393.75 393.75000001-393.75 393.75 176.30859375 393.74999999 393.75-176.30859375 393.75-393.74999999 393.75z m-1e-8-53.96484375c84.0234375 0 161.015625-30.67382813 220.42968751-81.38671875L253.77734375 163.39453125c-50.71289063 59.4140625-81.38671875 136.40625001-81.38671875 220.4296875 0 187.3828125 152.49023438 339.78515625 339.87304688 339.78515625z m0-679.65820313c-84.0234375 0-161.015625 30.67382813-220.34179687 81.38671875l478.91601563 478.91601563c50.71289063-59.4140625 81.38671875-136.40625001 81.38671874-220.34179688-0.17578125-187.47070313-152.578125-339.9609375-339.96093749-339.9609375z"  horiz-adv-x="1024" />
+
+    
     <glyph glyph-name="jiazaizhong" unicode="&#59055;" d="M864 416H704c-17.6 0-32-14.4-32-32s14.4-32 32-32h160c17.6 0 32 14.4 32 32s-14.4 32-32 32z m-512-32c0 17.6-14.4 32-32 32H160c-17.6 0-32-14.4-32-32s14.4-32 32-32h160c17.6 0 32 14.4 32 32z m160-160c-17.6 0-32-14.4-32-32v-160c0-17.6 14.4-32 32-32s32 14.4 32 32V192c0 17.6-14.4 32-32 32z m0 544c-17.6 0-32-14.4-32-32v-160c0-17.6 14.4-32 32-32s32 14.4 32 32V736c0 17.6-14.4 32-32 32z m138.6-304c8.8-15.4 28.4-20.6 43.8-11.8l138.6 80c15.4 8.8 20.6 28.4 11.8 43.8s-28.4 20.6-43.8 11.8l-138.6-80c-15.4-9-20.6-28.4-11.8-43.8zM373.4 304c-8.8 15.4-28.4 20.6-43.8 11.8l-138.6-80c-15.4-8.8-20.6-28.4-11.8-43.8s28.4-20.6 43.8-11.8l138.6 80c15.4 9 20.6 28.4 11.8 43.8z m262.4-70.2c-8.8 15.4-28.4 20.6-43.8 11.8s-20.6-28.4-11.8-43.8l80-138.6c8.8-15.4 28.4-20.6 43.8-11.8 15.4 8.8 20.6 28.4 11.8 43.8l-80 138.6z m-272 471c-8.8 15.4-28.4 20.6-43.8 11.8-15.4-8.8-20.6-28.4-11.8-43.8l80-138.6c8.8-15.4 28.4-20.6 43.8-11.8s20.6 28.4 11.8 43.8l-80 138.6zM592 522.6c15.4-8.8 34.8-3.6 43.8 11.8l80 138.6c8.8 15.4 3.6 34.8-11.8 43.8-15.4 8.8-34.8 3.6-43.8-11.8l-80-138.6c-8.8-15.4-3.6-35 11.8-43.8zM432 245.4c-15.4 8.8-34.8 3.6-43.8-11.8l-80-138.6c-8.8-15.4-3.6-34.8 11.8-43.8 15.4-8.8 34.8-3.6 43.8 11.8l80 138.6c8.8 15.4 3.6 35-11.8 43.8z m400.8-9.6l-138.6 80c-15.4 8.8-34.8 3.6-43.8-11.8-8.8-15.4-3.6-34.8 11.8-43.8l138.6-80c15.4-8.8 34.8-3.6 43.8 11.8 8.8 15.4 3.6 34.8-11.8 43.8zM191.2 532.2l138.6-80c15.4-8.8 34.8-3.6 43.8 11.8s3.6 34.8-11.8 43.8l-138.6 80c-15.4 8.8-34.8 3.6-43.8-11.8-8.8-15.4-3.6-34.8 11.8-43.8z"  horiz-adv-x="1024" />
 
     

escheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss

@@ -391,6 +391,17 @@ svg path:hover {
     text-align: center;
     margin-left: -100px;
   }
+  .ban-p {
+    position: absolute;
+    left: -4px;
+    top: 36px;
+    z-index: 21;
+    i {
+      font-size: 18px;
+      color: #ff0000;
+      cursor: pointer;
+    }
+  }
   .state-p {
     width: 20px;
     height: 20px;

escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js

@@ -192,9 +192,13 @@ JSP.prototype.jsonHandle = function ({ largeJson, locations }) {
       y: locations[v.id]['y'],
       targetarr: locations[v.id]['targetarr'],
       isAttachment: this.config.isAttachment,
-      taskType: v.type
+      taskType: v.type,
+      runFlag:v.runFlag
     }))
 
+    // ban icon
+    console.log($(`#${v.id}`).html())
+
     // contextmenu event
     $(`#${v.id}`).on('contextmenu', e => {
       this.tasksContextmenu(e)

escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/util.js

@@ -17,6 +17,7 @@
 
 import _ from 'lodash'
 import $ from 'jquery'
+import i18n from '@/module/i18n'
 import store from '@/conf/home/store'
 
 /**
@@ -39,16 +40,22 @@ const saveTargetarr = (valId, domId) => {
 /**
  * 返回节点html
  */
-const rtTasksTpl = ({ id, name, x, y, targetarr, isAttachment, taskType }) => {
+const rtTasksTpl = ({ id, name, x, y, targetarr, isAttachment, taskType,runFlag }) => {
   let tpl = ``
   tpl += `<div class="w jtk-draggable jtk-droppable jtk-endpoint-anchor jtk-connected ${isAttachment ? 'jtk-ep' : ''}" data-targetarr="${targetarr || ''}" data-tasks-type="${taskType}" id="${id}" style="left: ${x}px; top: ${y}px;">`
   tpl += `<div>`
-  tpl += `<div class="state-p"></div>`
-  tpl += `<div class="icos icos-${taskType}"></div>`
-  tpl += `<span class="name-p">${name}</span>`
+    tpl += `<div class="state-p"></div>`
+    tpl += `<div class="icos icos-${taskType}"></div>`
+    tpl += `<span class="name-p">${name}</span>`
   tpl += `</div>`
   tpl += `<div class="ep"></div>`
+    tpl += `<div class="ban-p">`
+    if (runFlag === 'FORBIDDEN') {
+      tpl += `<i class="iconfont" data-toggle="tooltip" data-html="true" data-container="body" data-placement="left" title="${i18n.$t('禁止执行')}">&#xe63e;</i>`
+    }
+    tpl += `</div>`
   tpl += `</div>`
+
   return tpl
 }