tianheng-ui 0.1.39 → 0.1.41

package/packages/FormMaking/custom/items/list_pro.vue

@@ -0,0 +1,18 @@
+<template>
+  <div>
+     
+  </div>
+</template>
+
+<script>
+export default {
+  data() {
+    return {};
+  },
+  created() {},
+  mounted() {},
+  methods: {},
+};
+</script>
+
+<style lang="scss" scoped></style>

package/packages/FormMaking/custom/items/tableH5_pro.vue

@@ -69,13 +69,12 @@ export default {
   methods: {
     handleTableAdd() {
       let dic = {};
-      this.widget.options.columns.forEach(item => {
+      this.widget.options.columns.map(item => {
         if (item.type === "grid") {
           for (let i = 0; i < item.options.columns.length; i++) {
-            const element = item.options.columns[i];
-            for (let j = 0; j < element.options.columns.length; j++) {
-              const element2 = element.options.columns[j];
-              dic[element2.model] = element2.options.defaultValue;
+            const column = item.options.columns[i];
+            for (const element of column.list) {
+              dic[element.model] = element.options.defaultValue;
             }
           }
         } else {

package/packages/FormMaking/custom/items/upload.vue

@@ -75,7 +75,7 @@ export default {
           this.$message.warning("未知的请求接口，请检查配置信息");
           return "";
         }
-        return `${baseUrl}/api/lc/api/${func.url}`;
+        return `${baseUrl}${func.url}`;
       } else {
         return this.widget.options.action;
       }

package/packages/FormMaking/index.vue

@@ -55,7 +55,9 @@
               v-for="(item, index) in getAdvanceComponents"
               class="fields-label"
               :class="{
-                'no-put': ['table', 'tableH5', 'tabs'].includes(item.type),
+                'no-put': ['table', 'tableH5', 'list', 'tabs'].includes(
+                  item.type
+                ),
                 [item.type]: true
               }"
               :key="index"
@@ -212,7 +214,7 @@ export default {
     },
     advanceFields: {
       type: Array,
-      default: () => ["table", "tableH5", "tabs", "blank"]
+      default: () => ["table", "tableH5", "list", "tabs", "blank"]
     },
     layoutFields: {
       type: Array,
@@ -263,6 +265,7 @@ export default {
     },
     config(val) {
       this.setConfig(val);
+      this.initApiConfig();
     },
     apiOptions(val) {
       this.initApiConfig();
@@ -314,6 +317,7 @@ export default {
           this.apiConfig[item.id] = item;
         });
       }
+      this.formConfig.config.network = this.apiConfig;
     },
 
     handleConfigSelect(value) {

package/packages/FormMaking/styles/index.scss

@@ -69,25 +69,25 @@ $primary-background-color: #ecf5ff;
       //   background-color: rgba(69, 90, 100, 0.2);
       // }
 
-      .tableH5 {
-        min-height: 50px;
-        border: 1px dashed #ccc;
-        background: #fff;
-        white-space: nowrap;
-        overflow-x: scroll;
-
-        .tableH5-item:nth-child(1) {
-          display: flex;
+      // .tableH5 {
+      //   min-height: 50px;
+      //   border: 1px dashed #ccc;
+      //   background: #fff;
+      //   white-space: nowrap;
+      //   overflow-x: scroll;
+
+      //   .tableH5-item:nth-child(1) {
+      //     display: flex;
 
-          .actions {
-            align-items: center;
-            justify-content: right;
-          }
-        }
-        .tableH5-item-widget {
-          width: calc(100% - 5px);
-        }
-      }
+      //     .actions {
+      //       align-items: center;
+      //       justify-content: right;
+      //     }
+      //   }
+      //   .tableH5-item-widget {
+      //     width: calc(100% - 5px);
+      //   }
+      // }
 
       .widgetFormItem {
         min-width: 100px;

package/packages/TableMaking/WidgetTools.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="widgetTools th-sticky_top">
+  <div class="widgetTools">
     <div class="left">
       <slot> </slot>
     </div>
@@ -123,7 +123,7 @@
     <th-dialog
       v-model="dialog.show"
       :title="dialogTitles[dialog.action]"
-      :modal="dialog.action !== 'previewPc'"
+      :modal="false"
       :modal-append-to-body="false"
       :showFooter="['importJson', 'importTemplate'].includes(dialog.action)"
       @on-fullscreen="handleDialogFullscreen"
@@ -245,7 +245,7 @@ export default {
   width: 100%;
   height: 45px;
   padding: 0 15px;
-  z-index: 999;
+  border-bottom: solid 1px #e4e7ed;
 
   .left {
   }

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

@@ -2,9 +2,9 @@
   <div class="generateTable-search">
     <el-row :gutter="10">
       <el-col
-        v-for="item in options"
+        v-for="item in getList"
         :key="item.prop"
-        :span="24 / options.length"
+        :span="24 / getList.length"
       >
         <el-input
           v-if="item.type === 'input' || item.elType === 'input'"
@@ -81,6 +81,17 @@ export default {
   data() {
     return {};
   },
+  computed: {
+    getList() {
+      if (this.options) {
+        const data = this.options.filter(item => {
+          return !item.hide;
+        });
+        return data;
+      }
+      return [];
+    }
+  },
   methods: {
     doSearch() {
       this.$emit("search", this.data);

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

@@ -2,7 +2,7 @@
   <div class="generateTable-search">
     <el-form :inline="true" :model="data" size="small">
       <el-form-item
-        v-for="item in options"
+        v-for="item in getList"
         :key="item.prop"
         :label="item.label"
       >
@@ -95,6 +95,17 @@ export default {
   data() {
     return {};
   },
+  computed: {
+    getList() {
+      if (this.options) {
+        const data = this.options.filter(item => {
+          return !item.hide;
+        });
+        return data;
+      }
+      return [];
+    }
+  },
   methods: {
     doSearch() {
       this.$emit("search", this.data);

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

@@ -9,10 +9,10 @@
       v-loading="config.loading.show"
       :element-loading-text="config.loading.text"
     >
-      <template v-for="item in config.options">
+      <template v-for="item in getList">
         <el-table-column
           v-if="item.type"
-          :key="item.prop"
+          :key="item.type"
           :type="item.type"
           :label="item.label"
           :width="item.width || 50"
@@ -20,10 +20,10 @@
         </el-table-column>
         <el-table-column
           v-else
-          :key="item.prop"
-          :prop="item.prop"
+          :key="item.pProp"
+          :prop="item.pProp"
           :label="item.label"
-          :width="item.width || 180"
+          :width="item.width"
         >
           <template slot-scope="scope">
             <slot
@@ -32,7 +32,7 @@
               :scope="scope"
               :option="item"
             />
-            <span v-else>{{ scope.row[item.prop] }}</span>
+            <span v-else>{{ getValue(scope.row, item.pProp) }}</span>
           </template>
         </el-table-column>
       </template>
@@ -54,9 +54,25 @@ export default {
   data() {
     return {};
   },
+
+  computed: {
+    getList() {
+      if (this.config.options) {
+        const data = this.config.options.filter(item => {
+          return !item.hide;
+        });
+        return data;
+      }
+      return [];
+    }
+  },
   created() {},
   mounted() {},
-  methods: {}
+  methods: {
+    getValue(item, key) {
+      return eval(`item.${key}`);
+    }
+  }
 };
 </script>
 

package/packages/TableMaking/generateTable.vue

@@ -393,14 +393,14 @@ export default {
       }
 
       const request = {
-        url: `api/lc/api/${config.url}`,
+        url: config.url,
         method: config.method,
         headers: { ...config.headers, actionType }
       };
       let params = {};
       switch (actionType) {
         case "list":
-          for (let key of Object.keys(config.params)) {
+          for (let key of Object.keys(config.interfaceParameterInputList)) {
             params[key] = paramsData[key] || this.query[key];
           }
           if (this.tableConfig.pageInfo.show) {
@@ -411,7 +411,7 @@ export default {
         case "add":
         case "edit":
         case "delete":
-          for (let key of Object.keys(config.params)) {
+          for (let key of Object.keys(config.interfaceParameterInputList)) {
             params[key] = paramsData[key];
           }
           break;