tianheng-ui 0.0.85 → 0.0.86

package/package.json

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

package/packages/FormMaking/custom/configs/select.vue

@@ -64,6 +64,11 @@
               </el-option>
             </el-option-group>
           </el-select>
+          <!-- <el-input
+            v-model="widget.options.remoteFunc"
+            placeholder="请输入远端方法"
+          >
+          </el-input> -->
 
           <el-input v-model="widget.options.props.value">
             <template slot="prepend">

package/packages/FormMaking/index.vue

@@ -396,7 +396,6 @@ export default {
     GenerateForm
   },
   props: {
-    formName: String,
     data: {
       type: Object,
       default: () => {
@@ -531,6 +530,9 @@ export default {
       }
     },
     data(val) {
+      if (val && val.config) {
+        val.config = Object.assign(this.widgetFormData.config, val.config);
+      }
       this.setJSON(val);
     }
   },

package/packages/TableMaking/generateTable.vue

@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div v-if="tableJson">
     <!-- 搜索栏 -->
     <search
       v-if="searchConfig.show"
@@ -73,6 +73,12 @@
       </th-form-generate>
     </th-dialog>
   </div>
+  <th-empty
+    v-else
+    :image="require('@/assets/images/notData.png')"
+    description="未获取到配置信息，请联系管理员。"
+  >
+  </th-empty>
 </template>
 
 <script>
@@ -187,7 +193,14 @@ export default {
       const info = sessionStorage.getItem("th_oauth_info");
       if (info) {
         this.requestConfigData();
-      } else {
+      } else if (this.config.token) {
+        const oauthInfo = {
+          token: this.config.token,
+          baseUrl: this.config.baseUrl
+        };
+        sessionStorage.setItem("th_oauth_info", JSON.stringify(oauthInfo));
+        this.requestConfigData();
+      } else if (this.config.network) {
         // 模拟授权认证流程
         this.axios({
           url: this.config.network.url,
@@ -195,15 +208,19 @@ export default {
           data: this.config.network.params,
           headers: this.config.network.headers
         }).then(res => {
-          const oauthInfo = { token: res.data, baseUrl: "" };
+          const oauthInfo = { token: res.data, baseUrl: this.config.baseUrl };
           sessionStorage.setItem("th_oauth_info", JSON.stringify(oauthInfo));
+          // this.axios.defaults.baseURL = this.config.baseUrl;
           this.requestConfigData();
         });
       }
     },
     // 获取配置信息
-    requestConfigData(code) {
+    requestConfigData() {
       this.tableJson = tableItemConfig(this.id);
+      if (!this.tableJson) {
+        return;
+      }
       // 网络请求
       this.networkConfig = this.tableJson.network;
 
@@ -310,14 +327,14 @@ export default {
           this.dialog.action.loading = false;
         });
     },
-    requestDeleteData(data, callback) {
+    requestDeleteData(callback) {
       if (!this.networkConfig.delete) return;
       this.dialog.action.loading = true;
       const apiInfo = this.networkConfig.delete;
       this.axios({
         url: apiInfo.api,
         method: apiInfo.method,
-        data
+        data: { ids: this.dialog.data.id }
       })
         .then(res => {
           callback(true);
@@ -328,6 +345,36 @@ export default {
           this.dialog.action.loading = false;
         });
     },
+    requestBatchDeleteData() {
+      if (!this.networkConfig.batchDelete) return;
+      this.$confirm("确认删除多条数据吗？", "操作提示", {
+        confirmButtonText: "删除",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          this.dialog.action.loading = true;
+          const data = [];
+          for (const item of this.tableSelectionData) {
+            data.push(item.id);
+          }
+          const apiInfo = this.networkConfig.batchDelete;
+          this.axios({
+            url: apiInfo.api,
+            method: apiInfo.method,
+            data
+          })
+            .then(res => {
+              callback(true);
+              this.dialog.action.loading = false;
+              this.requestListData();
+            })
+            .catch(err => {
+              this.dialog.action.loading = false;
+            });
+        })
+        .catch(() => {});
+    },
     requestFormConfigData() {
       setTimeout(() => {
         const form = this.dialog.action.form;
@@ -336,11 +383,9 @@ export default {
       }, 1000);
     },
     handleSearchSubmit(val) {
-      console.log("handleSearchSubmit =>", val);
       this.requestListData();
     },
     handleSearchReset(val) {
-      console.log("handleSearchReset =>", val);
       this.requestListData();
     },
     handleToolsClick(action) {
@@ -351,12 +396,8 @@ export default {
           this.requestFormConfigData();
           break;
         case "batchDelete":
-          action.loading = true;
-          setTimeout(() => {
-            action.loading = false;
-            this.tableSelectionData = [];
-            this.$refs.tableRef.getTable().clearSelection();
-          }, 1000);
+          this.dialog = { show: false, data: {}, action: action };
+          this.requestBatchDeleteData();
           break;
         case "export":
           action.loading = true;
@@ -385,7 +426,8 @@ export default {
           this.requestFormConfigData();
           break;
         case "delete":
-          this.requestDeleteData({ ids: item.id }, callback);
+          this.dialog = { show: false, data: item, action: action };
+          this.requestDeleteData(callback);
           break;
 
         default:
@@ -415,11 +457,9 @@ export default {
       this.formConfig = null;
     },
     handlePagingChange(val) {
-      console.log("handlePagingChange =>", val);
       this.requestListData();
     },
     handleSelectionChange(val) {
-      console.log("handleSelectionChange =>", val);
       this.tableSelectionData = val;
     }
   }

package/packages/TableMaking/util/index.js

@@ -223,7 +223,8 @@ const formConfig = {
         }
       ]
     }
-  }
+  },
+  '2':{}
 };
 
 export const formItemConfig = key => {
@@ -296,7 +297,7 @@ const tableConfig = {
       add: { show: true, name: "新增", position: 1, form: { id: "1" } },
       edit: { show: true, name: "编辑", position: 2, form: { id: "1" } },
       detail: { show: false, name: "查看", position: 2, form: { id: "1" } },
-      delete: { 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 },
@@ -426,6 +427,6 @@ const tableConfig = {
 };
 
 export const tableItemConfig = key => {
-  const config = tableConfig[key] || {};
+  const config = tableConfig[key] || null;
   return JSON.parse(JSON.stringify(config));
 };