tianheng-ui 0.1.76 → 0.1.77

package/package.json

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

package/packages/FormMaking/GenerateForm.vue

@@ -45,6 +45,7 @@ export default {
   name: "thFormGenerate",
   components: { GenetateFormItem },
   props: {
+    businessId: String,
     formId: String,
     query: Object,
     oauthConfig: {
@@ -194,7 +195,7 @@ export default {
       const requestConfig = {
         url: api.url,
         method: api.method,
-        headers: api.headers
+        headers: { ...api.headers, businessId: this.businessId }
       };
 
       // 因为是组件的远端接口，优先级：默认值 > 路由参数
@@ -255,7 +256,7 @@ export default {
       const requestConfig = {
         url: api.url,
         method: api.method,
-        headers: api.headers
+        headers: { ...api.headers, businessId: this.businessId }
       };
       const params = {};
       for (let e of api.inParams) {
@@ -317,7 +318,8 @@ export default {
         method: api.method,
         headers: {
           ...api.headers,
-          formId: this.formId
+          formId: this.formId,
+          businessId: this.businessId
         }
       };
       if (["get", "delete"].includes(api.method.toLowerCase()))

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

@@ -102,6 +102,10 @@ export default {
   mounted() {},
   methods: {
     getProperty: getProperty,
+    clearSelection() {
+      this.multipleSelection = [];
+      this.$refs.elTableRef.clearSelection();
+    },
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
@@ -115,10 +119,6 @@ export default {
     },
     handlePaginationChange() {
       this.$emit("change", this.config.pageInfo.options);
-    },
-    clearSelection() {
-      this.multipleSelection = [];
-      this.$refs.elTableRef.clearSelection();
     }
   }
 };
@@ -127,5 +127,8 @@ export default {
 <style lang="scss" scoped>
 .generateTable-table {
   width: 100%;
+  .el-pagination {
+    margin-top: 10px;
+  }
 }
 </style>

package/packages/TableMaking/generateTable.vue

@@ -43,7 +43,7 @@
     <th-empty
       v-else
       :image="require('@/assets/images/notData.png')"
-      :description="errorMessage || empty.description"
+      :description="empty.description"
     >
       <th-button type="primary" @click="initConfig">刷新</th-button>
     </th-empty>
@@ -59,10 +59,12 @@ import appConfig from "./config/index";
 import { deepClone, getProperty } from "./util";
 import * as Axios from "./network/axios";
 import * as XLSX from "xlsx/xlsx.mjs";
+import { setProperty } from "../FormMaking/util";
 export default {
   name: "thTableGenerate",
   components: { Search, Tools, STable, Actions },
   props: {
+    businessId: String,
     config: Object,
     oauthConfig: {
       type: Object,
@@ -77,23 +79,6 @@ export default {
           description: "暂无数据"
         };
       }
-    },
-    network: {
-      type: Object,
-      default: () => {
-        return {
-          page: {
-            url: "/api/lc/viewManage/getOne",
-            method: "POST",
-            params: {}
-          },
-          form: {
-            url: "/api/lc/formConfig/getById",
-            method: "get",
-            params: {}
-          }
-        };
-      }
     }
   },
   data() {
@@ -108,9 +93,6 @@ export default {
       tableConfig: null,
       tableData: [],
       tableSelectionData: [],
-      tableActionsConfig: {},
-      formConfig: null,
-      errorMessage: "",
       query: {}
     };
   },
@@ -280,30 +262,20 @@ export default {
         type: "warning"
       })
         .then(() => {
-          this.dialog.action.loading = true;
-
+          action.loading = true;
           this.axios(requestConfig)
             .then(res => {
               callback(true);
-              this.dialog.action.loading = false;
+              action.loading = false;
               this.requestListData();
             })
             .catch(err => {
-              this.dialog.action.loading = false;
+              action.loading = false;
             });
         })
         .catch(() => {});
     },
 
-    // 通用请求
-    requestApi(request, callback) {
-      if (!request) return;
-
-      this.axios(request)
-        .then(res => {})
-        .catch(err => {});
-    },
-
     // 请求拦截器，返回请求体
     requestInterceptors(queryParams, networkId, action) {
       const api = this.networkConfig[networkId];
@@ -315,13 +287,14 @@ export default {
       const request = {
         url: api.url,
         method: api.method,
-        headers: api.headers
+        headers: { ...api.headers, businessId: this.businessId }
       };
       let params = {};
       switch (action) {
         case "list":
           for (const item of api.inParams) {
-            params[item.pAlias] = queryParams[item.pAlias] || null;
+            const value = getProperty(queryParams, item.pAlias) || null;
+            setProperty(params, item.pAlias, value);
           }
           if (this.tableConfig.pageInfo.show) {
             const pageInfo = this.tableConfig.pageInfo.options;
@@ -332,8 +305,11 @@ export default {
           break;
         case "delete":
           for (const item of api.inParams) {
-            params[item.pAlias] =
-              queryParams[item.pAlias] || this.query[item.pAlias];
+            const value =
+              getProperty(queryParams, item.pAlias) ||
+              getProperty(this.query, item.pAlias) ||
+              null;
+            setProperty(params, item.pAlias, value);
           }
           break;
         case "batchDelete":
@@ -414,17 +390,12 @@ export default {
       }
     },
 
+    // 导出
     handleExportExcelByTable(rows, fileName = "example") {
       const ws = XLSX.utils.json_to_sheet(rows);
       const wb = XLSX.utils.book_new();
       XLSX.utils.book_append_sheet(wb, ws, fileName);
       XLSX.writeFileXLSX(wb, `${fileName}.xlsx`);
-    },
-
-    // 表单提交按钮事件回调
-    handleFormButtonSubmit() {
-      this.handleDialogClose();
-      this.requestListData();
     }
   }
 };

package/packages/TableMaking/widgetConfig.vue

@@ -13,10 +13,24 @@
     </div>
     <div v-if="activeTab.value === 'field'" class="configItem fieldsView">
       <template
-        v-if="fieldsData.inParams.length || fieldsData.outParams.length"
+        v-if="
+          fieldsData.inParams.length ||
+            fieldsData.outParams.length ||
+            config.table.fields.type === 'custom'
+        "
       >
         <el-collapse v-model="collapseValue">
-          <el-collapse-item title="查询字段" name="group-fields_search">
+          <el-collapse-item name="group-fields_search">
+            <div slot="title" style="width:100%;">
+              <span>查询字段</span>
+              <!-- <el-button
+                v-if="config.table.fields.type === 'custom'"
+                style="float:right;padding:12px 10px;"
+                type="text"
+                @click="handleParamsAdd('in')"
+                >新增</el-button
+              > -->
+            </div>
             <el-tree
               ref="fieldsSearchTreeRef"
               :data="fieldsData.inParams"
@@ -30,7 +44,17 @@
             >
             </el-tree>
           </el-collapse-item>
-          <el-collapse-item title="列表字段" name="group-fields_table">
+          <el-collapse-item name="group-fields_table">
+            <div slot="title" style="width:100%;">
+              <span>列表字段</span>
+              <!-- <el-button
+                v-if="config.table.fields.type === 'custom'"
+                style="float:right;padding:12px 10px;"
+                type="text"
+                @click="handleParamsAdd('out')"
+                >新增</el-button
+              > -->
+            </div>
             <el-tree
               ref="fieldsTableTreeRef"
               :data="fieldsData.outParams"
@@ -69,13 +93,15 @@
                 <span style="color: #409EFF;">字段类型</span>
               </el-tooltip>
               <el-radio-group v-model="config.table.fields.type">
-                <el-radio-button label="custom" disabled
-                  >自定义</el-radio-button
-                >
+                <el-radio-button label="custom">自定义</el-radio-button>
                 <el-radio-button label="api">接口导入</el-radio-button>
               </el-radio-group>
             </el-form-item>
-            <el-form-item required prop="table.mounted.api">
+            <el-form-item
+              v-if="config.table.fields.type === 'api'"
+              required
+              prop="table.mounted.api"
+            >
               <el-tooltip
                 slot="label"
                 effect="light"
@@ -917,6 +943,7 @@ export default {
         this.config.table.options = nodes;
       }
     },
+    handleParamsAdd(action) {},
     // 对外暴露表单校验
     formValidate() {
       return new Promise((resolve, reject) => {

package/packages/TableMaking/widgetTable.vue

@@ -1,6 +1,15 @@
 <template>
   <div class="widgetTable">
-    <div class="table-title">查询字段</div>
+    <div class="table-title">
+      <span>查询字段</span>
+      <el-button
+        v-if="config.table.fields.type === 'custom'"
+        style="float:right;padding:0px 10px;"
+        type="text"
+        @click="handleParamsAdd('in')"
+        >新增</el-button
+      >
+    </div>
     <div
       class="tableList searchList"
       v-loading="!config.search.show"
@@ -95,7 +104,16 @@
       </draggable>
       <div v-else class="search-content"></div>
     </div>
-    <div class="table-title">列表字段</div>
+    <div class="table-title">
+      <span>列表字段</span>
+      <el-button
+        v-if="config.table.fields.type === 'custom'"
+        style="float:right;padding:0px 10px;"
+        type="text"
+        @click="handleParamsAdd('out')"
+        >新增</el-button
+      >
+    </div>
     <div class="tableList" style="height: calc(100% - 350px);">
       <div class="table-item table-header">
         <div class="table-item-custom">拖动</div>
@@ -246,6 +264,20 @@ export default {
     handleDialogAffirm() {
       this.dialog.data.staticData = this.codeEditorValue;
       this.dialog = { visible: false, title: "", data: null };
+    },
+    handleParamsAdd(action) {
+      if (action === "in") {
+        this.config.search.options.push({
+          alias: "",
+          align: "left",
+          elType: "input",
+          id: new Date().getTime(),
+          javaType: "String",
+          label: "字段名",
+          pAlias: "",
+          prop: ""
+        });
+      }
     }
   }
 };
@@ -259,8 +291,10 @@ export default {
   overflow-y: overlay;
 
   .table-title {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
     height: 25px;
-    line-height: 25px;
   }
   .searchList {
     margin: 10px 0;