列表字段排序优化 指标模块优化

src/components/ColumnDesign/scene.vue

@@ -88,7 +88,7 @@
         <vxe-column field="visible" title="显示" width="90">
           <template #header> <vxe-checkbox v-model="visibleCheck" size="mini">显示</vxe-checkbox></template>
           <template slot-scope="scope">
-            <el-checkbox v-model="scope.row.visible" @change="visibleCheckChange(scope)" />
+            <el-checkbox v-model="scope.row.visible" @change="visibleCheckChange(scope,'visible')" />
           </template>
         </vxe-column>
         <!--        <vxe-column field="visible" title="移动端显示" width="90">-->
@@ -100,7 +100,7 @@
         <vxe-column field="sortable" title="排序" width="90">
           <template #header> <vxe-checkbox v-model="sortCheck" size="mini">排序</vxe-checkbox></template>
           <template slot-scope="scope">
-            <el-checkbox v-model="scope.row.sortable" />
+            <el-checkbox v-model="scope.row.sortable" @change="visibleCheckChange(scope,'sortable')"/>
           </template>
         </vxe-column>
         <vxe-column field="showSummary" title="合计" width="60">
@@ -378,15 +378,15 @@ export default {
       this.fieldFormSet = g.Copy(item)
       this.isColorVisible = true
     },
-    visibleCheckChange(scope) {
+    visibleCheckChange(scope,type) {
       const { row } = scope;
-      this.updateChildrenVisibility(row, row.visible);
+      this.updateChildrenVisibility(row, type,row[type]);
     },
-    updateChildrenVisibility(node, visibility) {
+    updateChildrenVisibility(node, type,visibility) {
       if (node.children && node.children.length > 0) {
         node.children.forEach(child => {
-          child.visible = visibility;
-          this.updateChildrenVisibility(child, visibility);
+          child[type] = visibility;
+          this.updateChildrenVisibility(child,type, visibility);
         });
       }
     },

src/components/Generator/index/RightPanel.vue

@@ -360,8 +360,8 @@
                 </template>
                 <template slot-scope="scope">
                   <el-switch v-model="scope.row.plaintext" :active-value="1" :inactive-value="0"> </el-switch>
-                  <el-tooltip style="cursor: pointer" effect="dark" :content="'如果开启明文保存，预览列表将不支持跳转'" placement="top">
-                    <i v-if="scope.row.plaintext === 1" class="el-icon-question" />
+                  <el-tooltip v-if="scope.row.plaintext === 1"  style="cursor: pointer" effect="dark" :content="'如果开启明文保存，预览列表将不支持跳转'" placement="top">
+                    <i class="el-icon-question" />
                   </el-tooltip>
                 </template>
               </el-table-column>

src/views/form/webDesign/dataController.vue

@@ -119,11 +119,16 @@
           <el-input v-model="dataContCssForm.borderSpreadRadius" style="width:200px" clearable placeholder="请输入" size="mini"></el-input>
           <div :style="borderStyle"></div>
         </el-form-item>
-        <el-form-item>
-          <el-button @click="dataContCssConfigVis = false">取消</el-button>
-          <el-button type="primary" @click="onCssFormSubmit">确认</el-button>
-        </el-form-item>
+<!--        <el-form-item>-->
+<!--          <el-button @click="dataContCssConfigVis = false">取消</el-button>-->
+<!--          <el-button type="primary" @click="onCssFormSubmit">确认</el-button>-->
+<!--        </el-form-item>-->
       </el-form>
+
+      <div style="text-align:right" class="dialog-footer">
+        <el-button @click="dataContCssConfigVis = false">取 消</el-button>
+        <el-button  type="primary" @click="onCssFormSubmit">确 定</el-button>
+      </div>
     </el-dialog>
     <el-dialog :close-on-click-modal="false"
                :close-on-press-escape="false"
@@ -247,6 +252,7 @@
           <div class="label label-title">
             <aceEditor ref="editor" v-model="addForm.columnFormula" height="529" lang="sql" snippets wrap />
           </div>
+          <p style="padding-top: 10px;color:#999999;padding-left:10px;">请输入标准SQL查询语句，例如：select count(*) from tb_name</p>
         </div>
         <div class="panel" style="margin-right: 10px">
           <div class="label">点击引用字段</div>
@@ -475,7 +481,7 @@ export default {
       this.addForm = {
         id:'',
         eventName:'',
-        columnFormula:'请输入标准SQL查询语句，例如：select count(*) from tb_name',
+        columnFormula:'',
         describeTitle:'',
         status:1,
         blockColor:'',