tianheng-ui 0.1.52 → 0.1.54

package/package.json

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

package/packages/FormMaking/GenerateForm.vue

@@ -218,6 +218,7 @@ export default {
       }
       this.hendleElementRemoteData(item);
     },
+    // 获取组件的远端数据
     hendleElementRemoteData(item) {
       if (!item.options.remote) return;
       if (item.type === "upload" || item.type === "button") return;
@@ -229,17 +230,17 @@ export default {
         method: api.method,
         headers: api.headers
       };
+
+      // 因为是组件的远端接口，优先级：默认值 > 路由参数
       const params = {};
       for (let e of api.inParams) {
         const value =
-          getProperty(this.models, e.pAlias) ||
-          getProperty(this.query, e.pAlias) ||
-          null;
-        setProperty(params, e.pAlias, value);
+          e.defaultValue || getProperty(this.query, e.alias) || null;
+        setProperty(params, e.alias, value);
       }
       if (api.needPage) {
-        params.pageNum = 1;
-        params.pageSize = 20;
+        params.pageNum = params.pageNum || 1;
+        params.pageSize = params.pageSize || 20;
       }
       if (["get", "delete"].includes(api.method.toLowerCase()))
         requestConfig.params = params;
@@ -271,12 +272,6 @@ export default {
       const api = this.formConfig.config.network[val];
       if (!api) return this.$message.warning("未知的接口，请检查配置信息");
 
-      const requestConfig = {
-        url: api.url,
-        method: api.method,
-        headers: api.headers
-      };
-
       let params = {};
       const inParams = api.inParams;
       const initParams = list => {
@@ -290,11 +285,16 @@ export default {
         });
       };
       initParams(inParams);
-
       if (api.needPage) {
-        params.pageNum = 1;
-        params.pageSize = 20;
+        params.pageNum = params.pageNum || 1;
+        params.pageSize = params.pageNum || 20;
       }
+
+      const requestConfig = {
+        url: api.url,
+        method: api.method,
+        headers: api.headers
+      };
       if (["get", "delete"].includes(api.method.toLowerCase()))
         requestConfig.params = params;
       else requestConfig.data = params;

package/packages/TableMaking/custom/config.js

@@ -15,11 +15,13 @@ export const table = {
   pageInfo: {
     show: true,
     options: {
-      pageCount: 0,
-      pageSize: 20,
-      currentPage: 1,
-      total: 0,
-      sizes: [10, 20, 50, 100],
+      pageCount: 0, //总页数
+      pageSize: 20, //每页条数
+      pageSizeName: "pageSize",
+      currentPage: 1, //当前页数
+      currentPageName: "pageNum",
+      total: 0, //总条数
+      sizes: [10, 20, 50, 100], //每页显示个数
       layout: "total,sizes,prev,pager,next,jumper"
     },
     style: {

package/packages/TableMaking/custom/items/actions/index-pc.vue

@@ -33,7 +33,7 @@
           :disabled="item.style.disabled || loadingDel"
           :loading="item.style.loading"
           @click="pop = true"
-          >{{ item.name }}</el-button
+          >{{ item.text }}</el-button
         >
       </el-popover>
       <el-button
@@ -49,7 +49,7 @@
         :disabled="item.style.disabled"
         :loading="item.style.loading"
         @click="handleClick(item)"
-        >{{ item.name }}</el-button
+        >{{ item.text }}</el-button
       >
     </template>
   </div>

package/packages/TableMaking/custom/items/table/index-h5.vue

@@ -16,13 +16,13 @@
           {{ column.label }}
         </div>
         <div class="table-list-item-row-value" :style="valueStyle">
-          {{ groupItem[column.prop] != null ? groupItem[column.prop] : "" }}
+          {{ groupItem[column.pAlias] != null ? groupItem[column.pAlias] : "" }}
         </div>
       </div>
       <div class="table-list-item-tools">
         <el-button
           v-for="button in config.actions"
-          :key="button.name"
+          :key="button.type"
           :type="button.style.type"
           :icon="button.style.icon"
           :plain="button.style.plain"

package/packages/TableMaking/custom/items/tools/index-pc.vue

@@ -13,7 +13,7 @@
           :disabled="item.style.disabled || disabled[item.act]"
           :loading="item.style.loading"
           @click="handleClick(item)"
-          >{{ item.name }}</el-button
+          >{{ item.text }}</el-button
         >
       </el-form-item>
     </el-form>

package/packages/TableMaking/generateTable.vue

@@ -43,7 +43,7 @@
         :page-size="tableConfig.pageInfo.options.pageSize"
         :page-sizes="tableConfig.pageInfo.options.sizes"
         :layout="tableConfig.pageInfo.options.layout"
-        :total="1000"
+        :total="tableConfig.pageInfo.options.total"
       >
       </el-pagination>
     </template>
@@ -53,15 +53,16 @@
       v-model="dialog.show"
       :title="dialog.action.name"
       :modal-append-to-body="false"
-      :z-index="9999"
+      :showFooter="false"
       @on-affirm="handleDialogAffirm"
       @on-close="handleDialogClose"
     >
       <th-form-generate
         v-if="formConfig"
+        ref="formGenerate"
         :config="formConfig"
         :value="dialog.data"
-        ref="formGenerate"
+        @button-submit="handleFormButtonSubmit"
       >
       </th-form-generate>
     </th-dialog>
@@ -385,34 +386,38 @@ export default {
     },
 
     // 请求拦截器，返回请求体
-    requestInterceptors(paramsData, networkId, actionType) {
-      const config = this.networkConfig[networkId];
-      if (!config) {
-        this.$message.error("未知的请求接口，请检查配置信息");
+    requestInterceptors(queryParams, networkId, action) {
+      const api = this.networkConfig[networkId];
+      if (!api) {
+        this.$message.error("未知的接口，请检查配置信息");
         return;
       }
 
       const request = {
-        url: config.url,
-        method: config.method,
-        headers: { ...config.headers, actionType }
+        url: api.url,
+        method: api.method,
+        headers: api.headers
       };
       let params = {};
-      switch (actionType) {
+      switch (action) {
         case "list":
-          for (let key of Object.keys(config.inParams)) {
-            params[key] = paramsData[key] || this.query[key];
+          for (const item of api.inParams) {
+            params[item.pAlias] =
+              queryParams[item.pAlias] || this.query[item.pAlias];
           }
           if (this.tableConfig.pageInfo.show) {
-            params.current = this.tableConfig.pageInfo.options.currentPage;
-            params.size = this.tableConfig.pageInfo.options.pageSize;
+            const pageInfo = this.tableConfig.pageInfo.options;
+            params[pageInfo.currentPageName || "pageNum"] =
+              pageInfo.currentPage;
+            params[pageInfo.pageSizeName || "pageSize"] = pageInfo.pageSize;
           }
           break;
         case "add":
         case "edit":
         case "delete":
-          for (let key of Object.keys(config.inParams)) {
-            params[key] = paramsData[key];
+          for (const item of api.inParams) {
+            params[item.pAlias] =
+              queryParams[item.pAlias] || this.query[item.pAlias];
           }
           break;
         case "batchDelete":
@@ -427,7 +432,8 @@ export default {
           break;
       }
 
-      if (config.method.toLowerCase() === "get") request.params = params;
+      if (["get", "delete"].includes(api.method.toLowerCase()))
+        request.params = params;
       else request.data = params;
 
       return request;
@@ -497,6 +503,7 @@ export default {
     },
     // 弹窗关闭
     handleDialogClose() {
+      this.dialog.show = false;
       this.formConfig = null;
     },
 
@@ -505,6 +512,12 @@ export default {
     },
     handleSelectionChange(val) {
       this.tableSelectionData = val;
+    },
+
+    // 表单提交按钮事件回调
+    handleFormButtonSubmit() {
+      this.handleDialogClose();
+      this.requestListData();
     }
   }
 };

package/packages/TableMaking/widgetConfig.vue

@@ -174,6 +174,14 @@
                   >
                 </el-radio-group>
               </el-form-item>
+              <el-form-item label="分页参数">
+                <el-input placeholder="请输入" v-model="config.table.pageInfo.options.currentPageName">
+                  <template slot="prepend">页码</template>
+                </el-input>
+                <el-input placeholder="请输入" v-model="config.table.pageInfo.options.pageSizeName">
+                  <template slot="prepend">条数</template>
+                </el-input>
+              </el-form-item>
               <el-form-item>
                 <el-tooltip slot="label" effect="light" placement="top">
                   <div slot="content">