perf: 移除表格设计器多余代码

BoBoooooo · Oct 29, 2020 · 2b90ad8 · 2b90ad8
1 parent a3ce816
commit 2b90ad8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 47 deletions.
diff --git a/src/components/TableDesigner/MenuBar.vue b/src/components/TableDesigner/MenuBar.vue
@@ -37,43 +37,16 @@
         </el-dropdown-item>
       </el-dropdown-menu>
     </el-dropdown>
-    <!-- 选择表单名称以进行后续操作 -->
-    <el-tooltip class="item"
-                effect="dark"
-                content="如需拉取表单，请输入表单名称。"
-                placement="top">
-      <el-select v-model="selectedForm"
-                size="small"
-                 v-if="formList.length>0"
-                 placeholder="请选择表单"
-                 filterable>
-        <el-option v-for="(form, index) in formList"
-                   :key="index"
-                   :label="form.tableName"
-                   :value="form.tableName"></el-option>
-      </el-select>
-    </el-tooltip>
-    <el-popover placement="bottom-start"
-                width="430"
-                trigger="click">
-      <div class="viewColumn">
-        <h2>功能列
-          <span>{{fieldConfig.filter(c=>c.show).length}}/{{fieldConfig.length}}</span>
-        </h2>
-        <div class="chk-container">
-          <el-checkbox v-for="(column) in fieldConfig"
-                       :key="column.name"
-                       v-model="column.show"
-                       class="chkColumn"
-                       border>
-            {{column.name}}
-          </el-checkbox>
-        </div>
-      </div>
-      <el-button slot="reference" size="small">
-        可视功能<i class="el-icon-arrow-down el-icon--right"></i>
-      </el-button>
-    </el-popover>
+    <el-select v-model="selectedForm"
+              size="small"
+                v-if="formList.length>0"
+                placeholder="请选择表单"
+                filterable>
+      <el-option v-for="(form, index) in formList"
+                  :key="index"
+                  :label="form.tableName"
+                  :value="form.tableName"></el-option>
+    </el-select>
   </el-container>
 </template>
 
@@ -99,11 +72,6 @@ export default {
         columns: [],
       }),
     },
-    // 设计列隐藏
-    fieldConfig: {
-      type: Array,
-      default: () => [],
-    },
     minColumnWidth: {
       type: Number,
       default: 140,

diff --git a/src/components/TableDesigner/TableDesignerDialog.vue b/src/components/TableDesigner/TableDesignerDialog.vue
@@ -22,7 +22,6 @@
     <!-- 菜单栏 -->
     <MenuBar style="float:right"
              :designedJSON.sync="objJSON"
-             :fieldConfig="fieldConfig"
              :minColumnWidth="minColumnWidth" />
     <table class="tableDesigner">
       <thead>
@@ -109,10 +108,8 @@
     </table>
     <code>
       <b>表格配置规则</b><br>
-      1.插槽请勿随意修改，插槽的设置必须与JS代码配合，详细原理请参考BaseTable.vue组件<br>
-      2.表格宽度足够时，以列宽为准。表格字段过多时，设置列宽没有意义，设置最小宽度才能生效。<br>
-      3.请勿把插槽列设置为可检索。客户端排序未开发。从表单获取的options字典信息暂未开发编辑功能。<br>
-      4.请勿随意修改列的顺序，必须严格参考需求文档，如手误修改顺序可以刷新页面放弃修改。<br>
+      1.操作列插槽默认为actionColumn,自定义列插槽为:columnFormatter<br>
+      2.支持通过表单设计json自动生成表格
     </code>
     <!-- 底部按钮栏 -->
     <el-row type="flex"