Kaynağa Gözat

feat:数据和交互问题

ananzhusen 1 yıl önce
ebeveyn
işleme
d99514fefd

+ 5 - 2
src/views/components/Conditions.vue

@@ -7,7 +7,7 @@
       <label>触发条件</label>
       <div class="w-full flex middle between">
         <div></div>
-        <t-radio-group v-model="data.conditionType">
+        <t-radio-group class="ml-8" v-model="data.conditionType">
           <t-radio value="and"> 满足全部条件 </t-radio>
           <t-radio value="or"> 满足任意条件 </t-radio>
         </t-radio-group>
@@ -28,7 +28,7 @@
       <div class="">
         <div class="form-item mt-4">
           <label>条件类型</label>
-          <t-radio-group v-model="c.type">
+          <t-radio-group class="ml-8" v-model="c.type">
             <t-radio value=""> 关系条件 </t-radio>
             <t-radio value="fn"> 高级条件 </t-radio>
           </t-radio-group>
@@ -221,6 +221,9 @@ const onChangeTriggerTarget = (c: any) => {
 };
 
 const addTriggerCondition = (data: any) => {
+  if (!data.conditionType) {
+    data.conditionType = 'and';
+  }
   data.conditions.push({
     type: '',
     operator: '=',

+ 2 - 2
src/views/components/PenDatas.vue

@@ -1304,7 +1304,7 @@ onUnmounted(() => {
   height: 100%;
 
   .grid {
-    grid-template-columns: 80px 120px 54px 30px;
+    grid-template-columns: 70px 100px 44px 30px;
     padding: 0 12px;
 
     &.head {
@@ -1345,7 +1345,7 @@ onUnmounted(() => {
     }
 
     & > div {
-      width: 90px;
+      width: 72px;
       &.t-switch {
         width: fit-content;
         margin-left: 4px;