tianheng-ui 0.1.51 → 0.1.53

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.1.51",
+  "version": "0.1.53",
   "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/FormMaking/WidgetConfig.vue

@@ -515,9 +515,9 @@ export default {
     "data.options.remoteFunc"(val) {
       this.handleFieldsApiChange(val);
     },
-    apiOptions() {
-      this.handleFieldsApiChange(this.config.fields.api, true);
-    }
+    // apiOptions() {
+    //   this.handleFieldsApiChange(this.config.fields.api, true);
+    // }
   },
   created() {
     this.activeTab = this.tabsMenus[1];

package/packages/FormMaking/index.vue

@@ -322,6 +322,19 @@ export default {
         }
       };
       initList(this.formConfig.list);
+      
+      const initParams = (paramsList, pAlias, bool) => {
+        paramsList.forEach(item => {
+          if (bool) {
+            item.elType = "input";
+            item.align = "left";
+          }
+          item.pAlias = pAlias ? `${pAlias}.${item.alias}` : item.alias;
+          if (item.children && item.children.length) {
+            initParams(item.children, item.pAlias);
+          }
+        });
+      };
       const apis = Object.values(fieldsApi);
       const network = {};
       this.apiOptions.map(api => {
@@ -329,8 +342,10 @@ export default {
           // 初始化接口参数
           if (this.formConfig.config.fields.remote && isGetParams) {
             const callback = res => {
-              api.inParams = res.inParams;
-              api.outParams = res.outParams;
+              api.inParams = deepClone(res.inParams);
+              api.outParams = deepClone(res.outParams);
+              initParams(api.inParams, null, false);
+              initParams(api.outParams, null, false);
             };
             this.$emit("remote-params", api.id, callback);
           }

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/generateTable.vue

@@ -404,8 +404,10 @@ export default {
             params[key] = paramsData[key] || this.query[key];
           }
           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":

package/packages/TableMaking/index.vue

@@ -111,13 +111,13 @@ export default {
       this.apiOptions.map(api => {
         if (apis.includes(api.id)) {
           // 初始化接口参数
-          if (this.tableConfig.table.fields.remote) {
-            const callback = res => {
-              api.inParams = res.inParams;
-              api.outParams = res.outParams;
-            };
-            this.$emit("remote-params", api.id, callback);
-          }
+          // if (this.tableConfig.table.fields.remote) {
+          //   const callback = res => {
+          //     api.inParams = res.inParams;
+          //     api.outParams = res.outParams;
+          //   };
+          //   this.$emit("remote-params", api.id, callback);
+          // }
           network[api.id] = api;
         }
       });

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">
@@ -763,6 +771,15 @@ export default {
     },
     "config.tools.import.api"(val) {
       if (this.config.tools.import.show) this.handleFieldsApiChange(val);
+    },
+    apiOptions() {
+      if (this.config.table.mounted.api)
+        this.handleFieldsApiChange(this.config.table.mounted.api, true);
+
+      const toolsArr = Object.values(this.config.tools);
+      for (const item of toolsArr) {
+        if (item.api && item.show) this.handleFieldsApiChange(item.api);
+      }
     }
   },
   computed: {