openatc-components 0.1.95 → 0.1.97

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openatc-components",
-  "version": "0.1.95",
+  "version": "0.1.97",
   "description": "A Vue.js project",
   "author": "openatc developer",
   "private": false,

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

@@ -6,13 +6,13 @@
     </div>
     <div class="common-board-table-header">
       <el-row :gutter="13">
-        <el-col :span="6">{{this.$t('openatccomponents.pattern.phase')}}
+        <el-col :span="3">{{this.$t('openatccomponents.pattern.phase')}}
         </el-col>
-        <el-col :span="6">{{this.$t('openatccomponents.pattern.property')}}
+        <el-col :span="11">{{this.$t('openatccomponents.pattern.property')}}
         </el-col>
-        <el-col :span="6">{{this.$t('openatccomponents.pattern.delaystart')}}
+        <el-col :span="5">{{this.$t('openatccomponents.pattern.delaystart')}}
         </el-col>
-        <el-col :span="6">{{this.$t('openatccomponents.pattern.advanceend')}}
+        <el-col :span="5">{{this.$t('openatccomponents.pattern.advanceend')}}
         </el-col>
       </el-row>
     </div>
@@ -22,7 +22,7 @@
       :options="options">
       <div class="common-board-item" v-for="element in list" :key="element.id">
         <el-row :gutter="13" >
-          <el-col :span="6">
+          <el-col :span="3">
             <el-tooltip class="item" effect="dark" placement="left">
               <div slot="content">{{element.name}}</div>
               <div class="common-phase-description">
@@ -30,7 +30,7 @@
               </div>
             </el-tooltip>
         </el-col>
-          <el-col :span="6">
+          <el-col :span="11">
             <el-select v-model="element.options" size="small" multiple collapse-tags :placeholder="$t('openatccomponents.common.select')">
               <el-option
                 v-for="item in coordphaseOption"
@@ -40,10 +40,10 @@
               </el-option>
             </el-select>
           </el-col>
-          <el-col :span="6">
+          <el-col :span="5">
             <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="6">
+          <el-col :span="5">
             <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>

package/src/kisscomps/components/PatternStatus/PatternStatus.vue

@@ -1353,7 +1353,7 @@ export default {
   height: 34px;
 }
 .direction {
-  opacity: 0.6;
+  filter: brightness(70%);
 }
 .mask {
   background: rgb(242, 121, 121) !important;

package/src/kisscomps/components/StageStatus/StageStatus.vue

@@ -230,8 +230,16 @@ export default {
             return item.id === this.controlData.patternid
           })[0].rings
           if (!rings.rings) return
-
-          let mapAdd = ringList.map(item => {
+          let filterPattern = []
+          for (let i of ringList) {
+            for (let j of this.controlData.rings) {
+              let filterSequence = i.filter(item => j.sequence.includes(item.id))
+              if (filterSequence.length > 0) {
+                filterPattern.push(filterSequence)
+              }
+            }
+          }
+          let mapAdd = filterPattern.map(item => {
             return item.map(val => {
               return val.value + (val.sum ? val.sum : 0)
             })
@@ -242,7 +250,7 @@ export default {
             }) : 0
           }) : 0
           this.max = Math.max(...maxCycle)// 每个环的周期最大值
-          this.getControl(ringList)
+          this.getControl(filterPattern)
         }
       } else {
         let mapAdd = rings.map(item => {

package/src/node_modules/.package_versions.json

@@ -0,0 +1 @@
+{}

package/static/styles/schemeconfig.scss

@@ -308,7 +308,7 @@
     width: 90%;
   }
   .el-form-item {
-    margin-bottom: 0PX;
+    margin-bottom: 10PX;
   }
   .el-form-item__label {
     font-size: 14PX;
@@ -329,7 +329,7 @@
   height: 100%;
   padding: 21PX 0PX 21PX 28PX;
   min-width: 360PX;
-  overflow: hidden;
+  // overflow: hidden;
   .forbiddenstage{
     width: 60%;
     margin: 10px auto;
@@ -412,10 +412,13 @@
     color: $--color-text-secondary;
   }
   .closephasekanban {
-    width: 60%;
+    width: 77%;
     margin: 0 auto;
     margin-bottom: 13PX;
   }
+  .common-board-column {
+    max-width: unset !important;
+  }
   .ex
   .el-input {
     width: 85% !important;