修改执行条件

src/views/dataAccessPage/components/advanceQuery.vue

@@ -30,6 +30,9 @@
                 ">
                   <el-input v-model="row[col.prop]" size="small" placeholder="请输入" />
                 </template>
+                <template v-else-if="col.inputType === 'delete'">
+                  <i class="clickable-delete el-icon-error" @click="deleteParam(rowIndex)" />
+                </template>
                 <template v-else-if="col.inputType === 'connector'">
                   <div v-if="row.connector" class="clickable-toggle" @click="toggle(rowIndex)">
                     {{ row.connector === 'and' ? '并且' : '或者' }}
@@ -44,19 +47,6 @@
         </el-form>
       </el-scrollbar>
     </div>
-    <div v-if="adList" class="AdvancedQuery_list">
-      <el-scrollbar style="height: 100%" :horizontal="false">
-        <div v-for="(item,index) in catchOptions" :key="index">
-          <div style="cursor: pointer;" class="flex">
-            <span @click="queryRecover(item)" class="AdvancedQuery_list_text">{{ item.itemKey }}</span>
-            <el-popconfirm @confirm="queryConfirm(item,index)" :title="'确定删除'+item.itemKey+'吗？'">
-              <el-button slot="reference" type="text">删除</el-button>
-            </el-popconfirm>
-          </div>
-          <el-divider v-if="catchOptions.length != index+1"></el-divider>
-        </div>
-      </el-scrollbar>
-    </div>
   </div>
 </template>
 

src/views/dataAccessPage/components/nodeType.vue

@@ -1,7 +1,13 @@
 <template>
-  <el-dialog title="生成执行条件" width="700px" top="10px" :close-on-click-modal="false" append-to-body :visible.sync="showCron">
+  <el-dialog title="生成执行条件" width="750px" top="10px" :close-on-click-modal="false" append-to-body :visible.sync="showCron">
     <div class="content">
-      <advanceQuery ref="advanceQuery" :selectOptions="selectOptions" @getAdvancedQueryData="getAdvancedQueryData" />
+      <advanceQuery ref="advanceQuery" style="height: 50vh;" :selectOptions="selectOptions" @getAdvancedQueryData="getAdvancedQueryData" />
+      <div class="queryYl">
+        <el-button @click="handleYlSubmit" type="primary" size="small">预览执行条件数据</el-button>
+      </div>
+      <div class="queryInput">
+        <el-input size="small" type="textarea" rows="8" v-model="dataRules"></el-input>
+      </div>
       <div style="text-align: right;" class="d-foot">
         <el-button @click="showCron=false" size="small">取消</el-button>
         <el-button @click="handleSubmit" type="primary" size="small">确定</el-button>
@@ -45,15 +51,24 @@ export default {
       })
       const strmsg = `let indata = ${strdata} indata = JSON.stringify(indata) indata && ${strstring} ? 0 : 1`
       this.dataRules = strmsg
-      this.$emit('getColumnData', strmsg)
-      this.showCron = false
     },
-    handleSubmit () {
+    handleYlSubmit () {
       this.$refs['advanceQuery'].advancedQueryHandler()
+    },
+    handleSubmit () {
+      this.$emit('getColumnData', this.dataRules)
+      this.showCron = false
     }
   }
 }
 </script>
 
-<style>
+<style lang="scss" scoped>
+.queryYl {
+  margin-top: 35px;
+  text-align: right;
+}
+.queryInput {
+  padding: 35px 0;
+}
 </style>