tianheng-ui 0.0.82 → 0.0.84

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.0.82",
+  "version": "0.0.84",
   "author": "shu lang <403732931@qq.com>",
   "license": "MIT",
   "private": false,

package/packages/TableMaking/generateTable.vue

@@ -79,7 +79,7 @@
 import Search from "./custom/items/search";
 import Tools from "./custom/items/tools";
 import { toolsItemConfig, formItemConfig, tableItemConfig } from "./util/index";
-import * as Axios from "./util/axios";
+import * as Axios from "lib/theme-chalk/js/axios";
 export default {
   name: "thTableGenerate",
   components: { Search, Tools },
@@ -193,7 +193,7 @@ export default {
           data: this.config.network.params,
           headers: this.config.network.headers
         }).then(res => {
-          const oauthInfo = { token: res.data };
+          const oauthInfo = { token: res.data, baseUrl: "" };
           sessionStorage.setItem("th_oauth_info", JSON.stringify(oauthInfo));
           const code = this.$route.params.id;
           this.requestConfigData(code);
@@ -327,7 +327,7 @@ export default {
           this.dialog.action.loading = false;
         });
     },
-    getFormConfig() {
+    requestFormConfigData() {
       setTimeout(() => {
         const form = this.dialog.action.form;
         const config = formItemConfig(form.id);
@@ -347,7 +347,7 @@ export default {
       switch (action.act) {
         case "add":
           this.dialog = { show: true, data: {}, action: action };
-          this.getFormConfig();
+          this.requestFormConfigData();
           break;
         case "batchDelete":
           action.loading = true;
@@ -372,24 +372,16 @@ export default {
           break;
       }
     },
-    handlePagingChange(val) {
-      console.log("handlePagingChange =>", val);
-      this.requestListData();
-    },
-    handleSelectionChange(val) {
-      console.log("handleSelectionChange =>", val);
-      this.tableSelectionData = val;
-    },
     handleActionClick(index, item, action, callback) {
       console.log("handleActionClick =>", item, action);
       switch (action.act) {
         case "edit":
           this.dialog = { show: true, data: item, action: action };
-          this.getFormConfig();
+          this.requestFormConfigData();
           break;
         case "detail":
           this.dialog = { show: true, data: item, action: action };
-          this.getFormConfig();
+          this.requestFormConfigData();
           break;
         case "delete":
           this.requestDeleteData({ ids: item.id }, callback);
@@ -420,6 +412,14 @@ export default {
     },
     handleDialogClose() {
       this.formConfig = null;
+    },
+    handlePagingChange(val) {
+      console.log("handlePagingChange =>", val);
+      this.requestListData();
+    },
+    handleSelectionChange(val) {
+      console.log("handleSelectionChange =>", val);
+      this.tableSelectionData = val;
     }
   }
 };

package/packages/TableMaking/index.vue

@@ -72,8 +72,13 @@ export default {
     };
   },
   watch: {
-    fields(val) {
-      this.initConfig();
+    fields: {
+      handler(val, oldVal) {
+        if (oldVal.length === 0) {
+          this.initConfig();
+        }
+      },
+      deep: true
     },
     config(val) {
       this.initConfig();
@@ -84,22 +89,55 @@ export default {
   },
   methods: {
     initConfig() {
-      this.searchFields = [];
+      if (Object.keys(this.config).length) {
+        this.$refs.configRef.tableConfig = this.config;
+      }
+
+      const searchFields = [];
       const searchFieldsIndexs = [];
       if (this.config.search) {
-        const search = this.config.search.options;
-        for (const item of search) {
+        const searchOptions = this.config.search.options;
+        for (const item of searchOptions) {
           for (let i = 0; i < this.fields.length; i++) {
             const element = this.fields[i];
             if (element.prop === item.prop) {
-              this.searchFields.push(item);
+              searchFields.push(item);
               searchFieldsIndexs.push(i);
             }
           }
         }
+        this.searchFields = searchFields;
+        this.$refs.configRef.search = {
+          fields: searchFieldsIndexs,
+          isCheckAll: searchFieldsIndexs.length === this.fields.length,
+          isIndeterminate:
+            searchFieldsIndexs.length > 0 &&
+            searchFieldsIndexs.length < this.fields.length
+        };
       }
 
-      this.$refs.configRef.search.fields = searchFieldsIndexs;
+      const tableFields = [];
+      const tableFieldsIndexs = [];
+      if (this.config.table) {
+        const tableOptions = this.config.table.options;
+        for (const item of tableOptions) {
+          for (let i = 0; i < this.fields.length; i++) {
+            const element = this.fields[i];
+            if (element.prop === item.prop) {
+              tableFields.push(item);
+              tableFieldsIndexs.push(i);
+            }
+          }
+        }
+        this.tableFields = tableFields;
+        this.$refs.configRef.table = {
+          fields: tableFieldsIndexs,
+          isCheckAll: tableFieldsIndexs.length === this.fields.length,
+          isIndeterminate:
+            tableFieldsIndexs.length > 0 &&
+            tableFieldsIndexs.length < this.fields.length
+        };
+      }
     },
     handleFieldsChange(val) {
       const type = val.type;

package/packages/TableMaking/util/index.js

@@ -238,23 +238,12 @@ const tableConfig = {
       options: [
         {
           type: "input",
-          label: "姓名",
+          label: "平台名称",
           prop: "name",
           defaultValue: "",
           align: "left",
           width: 0
         }
-        // {
-        //   type: "select",
-        //   label: "性别",
-        //   prop: "gender",
-        //   align: "left",
-        //   width: 0,
-        //   staticData: [
-        //     { label: "男", value: "1" },
-        //     { label: "女", value: "0" }
-        //   ]
-        // }
       ]
     },
     table: {
@@ -286,17 +275,10 @@ const tableConfig = {
           sortable: true,
           align: "left",
           width: 0
-        },
-        {
-          label: "编辑时间",
-          type: "input",
-          prop: "updateTime",
-          align: "left",
-          width: 0
         }
       ],
       pageInfo: {
-        show: true,
+        show: false,
         options: {
           pageCount: 0, // 总页数
           pageSize: 20, // 每页展示的条数
@@ -318,7 +300,7 @@ const tableConfig = {
       batchDelete: { show: true, name: "批量删除", position: 1 },
       export: { show: true, name: "导出", position: 1 },
       import: { show: true, name: "导入", position: 1 },
-      key_123456:{}
+      key_123456: {}
     },
     network: {
       mounted: {

package/packages/TableMaking/widgetConfig.vue

@@ -50,7 +50,7 @@
         label-width="80px"
         size="mini"
       >
-        <el-collapse v-model="tableCollapse" @change="handleChange">
+        <el-collapse v-model="tableCollapse">
           <el-collapse-item title="表格配置" name="1">
             <el-form-item label="高级查询">
               <el-switch v-model="tableConfig.search.show"> </el-switch>
@@ -241,12 +241,13 @@ export default {
         tools: {
           add: { show: true, name: "新增", position: 1 },
           edit: { show: true, name: "编辑", position: 2 },
-          detail: { show: true, name: "查看", position: 2 },
+          detail: { show: false, name: "查看", position: 2 },
           delete: { show: true, name: "删除", position: 2 },
-          batchDelete: { show: true, name: "批量删除", position: 1 },
-          export: { show: true, name: "导出", position: 1 },
-          import: { show: true, name: "导入", position: 1 }
-        }
+          batchDelete: { show: false, name: "批量删除", position: 1 },
+          export: { show: false, name: "导出", position: 1 },
+          import: { show: false, name: "导入", position: 1 }
+        },
+        network: {}
       },
       sortFieldOptions: [{ label: "创建时间", value: "createTime" }]
     };