openatc-components 0.0.71 → 0.0.74

package/package/kisscomps/components/ExpendConfig/ExpendConfig.vue

@@ -6,11 +6,13 @@
     </div>
     <div class="common-board-table-header">
       <el-row :gutter="13">
-        <el-col :span="8">{{this.$t('openatccomponents.pattern.property')}}
+        <el-col :span="6">{{this.$t('openatccomponents.pattern.phase')}}
         </el-col>
-        <el-col :span="8">{{this.$t('openatccomponents.pattern.delaystart')}}
+        <el-col :span="6">{{this.$t('openatccomponents.pattern.property')}}
         </el-col>
-        <el-col :span="8">{{this.$t('openatccomponents.pattern.advanceend')}}
+        <el-col :span="6">{{this.$t('openatccomponents.pattern.delaystart')}}
+        </el-col>
+        <el-col :span="6">{{this.$t('openatccomponents.pattern.advanceend')}}
         </el-col>
       </el-row>
     </div>
@@ -20,7 +22,15 @@
       :options="options">
       <div class="common-board-item" v-for="element in list" :key="element.id">
         <el-row :gutter="13" >
-          <el-col :span="8">
+          <el-col :span="6">
+            <el-tooltip class="item" effect="dark" placement="left">
+              <div slot="content">{{element.name}}</div>
+              <div class="common-phase-description">
+                <xdrdirselector Width="40px" Height="40px" :showlist="element.desc" :ISActiveMask="ISActiveMask" :MaskColor="MaskColor"></xdrdirselector>
+              </div>
+            </el-tooltip>
+        </el-col>
+          <el-col :span="6">
             <el-select v-model="element.options" size="small" multiple collapse-tags :placeholder="$t('openatccomponents.common.select')">
               <el-option
                 v-for="item in coordphaseOption"
@@ -30,10 +40,10 @@
               </el-option>
             </el-select>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-input-number :controls="false" size="small" :min="0" :max="255" :step="1" v-model.number="element.delaystart" ref="type"></el-input-number>
           </el-col>
-          <el-col :span="8">
+          <el-col :span="6">
             <el-input-number :controls="false" size="small" :min="0" :max="255" :step="1" v-model.number="element.advanceend" ref="type"></el-input-number>
           </el-col>
         </el-row>
@@ -45,10 +55,12 @@
 
 <script>
 import draggable from 'vuedraggable'
+import xdrdirselector from '../XRDDirSelector/XRDDirSelector'
 export default {
   name: 'expend-config',
   components: {
-    draggable
+    draggable,
+    xdrdirselector
   },
   data () {
     return {
@@ -72,6 +84,15 @@ export default {
         return []
       }
     },
+    ISActiveMask: {
+      type: Boolean,
+      default: true
+    },
+    // 当phase的描述为空时，显示的图形颜色。
+    MaskColor: {
+      type: String,
+      default: '#000000'
+    },
     index: {
       type: Number
     },
@@ -88,6 +109,6 @@ export default {
 
 <style lang="scss" scoped>
 .el-input-number--small {
-  width: 94px;
+  width: unset !important;
 }
 </style>

package/package/kisscomps/components/KanBan/kanban.vue

@@ -115,7 +115,7 @@ export default {
     }
   },
   created () {
-    // this.addMinSplit()
+    this.addMinSplit()
     // console.log(this.list, 'list')
   },
   watch: {
@@ -132,7 +132,7 @@ export default {
         // let MaxCycle = globalParamModel.getParamsByType('patternList')[n].cycle
         // let pattern = globalParamModel.getParamsByType('patternList')[n]
         // globalParamModel.getParamsByType('patternList')[n].cycle = this.getMaxCycle(pattern)
-        // this.addMinSplit()
+        this.addMinSplit()
         this.$emit('handleSplit', n, newList)
       },
       deep: true

package/package/kisscomps/components/OverLap/OverLap.vue

@@ -1,5 +1,5 @@
 <template>
-<div class="overLap" v-if="checked" :style="{'width':'100%','margin':this.controlData ? '20px 0 0 0' :tentative ? '0' : '0 40px 0 327px'}">
+<div class="overLap" v-if="checked" :style="{'margin':this.controlData ? '20px 0 0 0' :tentative ? '0' : '0 40px 0 417px'}">
     <div class="ring-first" v-for="(list, index1) in this.overlapDatas" :key="index1">
         <div v-for="(item,index2) in list.stageLists" :key="index2" >
             <div class="first-2">