tianheng-ui 0.1.28 → 0.1.29

package/packages/TableMaking/generateTable.vue

@@ -5,8 +5,8 @@
       v-if="searchConfig.show"
       :data="searchData"
       :options="searchConfig.options"
-      @on-search="requestListData"
-      @on-reset="requestListData"
+      @search="requestListData"
+      @reset="requestListData"
     />
 
     <!-- 菜单栏 -->
@@ -17,11 +17,13 @@
         batchDelete: tableSelectionData.length === 0,
         export: tableSelectionData.length === 0
       }"
-      @on-click="handleToolsClick"
+      @click="handleToolsClick"
     />
 
+    <STable v-if="tableConfig" :data="tableData" :config="tableConfig"></STable>
+
     <!-- 表格 -->
-    <th-table
+    <!-- <th-table
       v-if="tableConfig.options.length"
       ref="tableRef"
       :data="tableData"
@@ -53,7 +55,7 @@
         >
         </th-table-action>
       </template>
-    </th-table>
+    </th-table> -->
 
     <!-- 表单 -->
     <th-dialog
@@ -88,11 +90,11 @@
 <script>
 import Search from "./custom/items/search";
 import Tools from "./custom/items/tools";
-import { toolsItemConfig } from "./util/index";
+import STable from "./custom/items/table";
 import * as Axios from "lib/theme-chalk/js/axios";
 export default {
   name: "thTableGenerate",
-  components: { Search, Tools },
+  components: { Search, Tools, STable },
   props: {
     config: Object,
     oauthConfig: {
@@ -136,8 +138,17 @@ export default {
       searchConfig: { show: false, options: [] },
       searchData: {},
       toolsConfig: { show: false, options: [] },
-      tableConfig: { options: [], pageInfo: {} },
-      tableData: [],
+      tableConfig: null,
+      tableData: [
+        { id: 1 },
+        { id: 2 },
+        { id: 3 },
+        { id: 4 },
+        { id: 5 },
+        { id: 6 },
+        { id: 7 },
+        { id: 8 }
+      ],
       tableSelectionData: [],
       dialog: { show: false, data: {}, action: {} },
       formConfig: null,
@@ -195,19 +206,14 @@ export default {
 
       // 搜索栏
       this.searchConfig = this.tableJson.search;
-      if (this.searchConfig.show) {
-        this.searchConfig.options.map(item => {
-          this.$set(this.searchData, item.prop, item.defaultValue || "");
-        });
-      }
+      this.searchConfig.options.map(item => {
+        this.$set(this.searchData, item.prop, item.defaultValue || "");
+      });
 
       // table
-      for (let i = 0; i < this.tableJson.table.options.length; i++) {
-        const element = this.tableJson.table.options[i];
-        delete element.type;
-      }
-      if (this.tableJson.table.sequence) {
-        this.tableJson.table.options.unshift({
+      this.tableConfig = this.tableJson.table;
+      if (this.tableConfig.sequence) {
+        this.tableConfig.options.unshift({
           type: "index",
           label: "序号"
         });
@@ -220,32 +226,28 @@ export default {
         actions: []
       };
 
+      // tools
+      this.toolsConfig = { show: false, options: [] };
       // 按position处理按钮，1：公共区，2：行内区
-      for (const key in this.tableJson.tools) {
-        if (Object.hasOwnProperty.call(this.tableJson.tools, key)) {
-          const element = this.tableJson.tools[key];
-          if (!element.show) continue;
-          if (key === "batchDelete") {
-            this.tableJson.table.options.unshift({
-              type: "selection"
-            });
-          }
-          const dic = toolsItemConfig(key, element);
-          dic.form = element.form;
-          if (element.position === 1 || element.position === "header") {
-            this.toolsConfig.show = true;
-            this.toolsConfig.options.push(dic);
-          } else if (element.position === 2 || element.position === "row") {
-            action.hide = false;
-            action.actions.push(dic);
-          }
+      Object.values(this.tableJson.tools).map(item => {
+        if (!item.show) return;
+        if (item.type === "batchDelete") {
+          this.tableConfig.options.unshift({
+            type: "selection"
+          });
         }
-      }
+        if (item.position === 1 || item.position === "header") {
+          this.toolsConfig.show = true;
+          this.toolsConfig.options.push(item);
+        } else if (item.position === 2 || item.position === "row") {
+          action.hide = false;
+          action.actions.push(item);
+        }
+      });
       action.width = action.actions.length * 60 + 20;
-      this.tableJson.table.options.push(action);
+      if (!action.hide) this.tableConfig.options.push(action);
 
-      this.tableConfig = this.tableJson.table;
-      this.requestListData();
+      // this.requestListData();
     },
     requestListData() {
       if (!this.networkConfig.mounted) return;
@@ -396,7 +398,7 @@ export default {
     },
     handleToolsClick(action) {
       console.log("handleToolsClick =>", action);
-      switch (action.act) {
+      switch (action.type) {
         case "add":
           this.dialog = { show: true, data: {}, action: action };
           this.requestFormConfigData(action);

package/packages/TableMaking/widgetConfig.vue

@@ -606,7 +606,7 @@ export default {
             label: item.note || item.name,
             alias: item.name,
             prop: item.name,
-            type: "input",
+            elType: "input",
             align: "left"
           };
         });

package/packages/TableMaking/widgetTable.vue

@@ -31,11 +31,10 @@
           <div class="table-item-custom drag">
             <i class="iconfont icon-drag drag-widget"></i>
           </div>
-          <div>{{ item.label }}</div>
-          <!-- <div>{{ item.prop }}</div> -->
+          <el-input v-model="item.label" size="mini"></el-input>
           <div>
             <el-select
-              v-model="item.type"
+              v-model="item.elType"
               placeholder="请选择"
               size="mini"
               disabled
@@ -103,8 +102,7 @@
           <div class="table-item-custom drag">
             <i class="iconfont icon-drag drag-widget"></i>
           </div>
-          <div>{{ item.label }}</div>
-          <!-- <div>{{ item.prop }}</div> -->
+          <el-input v-model="item.label" size="mini"></el-input>
           <div>
             <el-select v-model="item.align" placeholder="请选择" size="mini">
               <el-option