tianheng-ui 0.1.36 → 0.1.37

package/package.json

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

package/packages/FormMaking/FormConfig.vue

@@ -13,7 +13,7 @@
           <el-form-item prop="fieldsType" required>
             <el-tooltip
               slot="label"
-              effect="dark"
+              effect="light"
               content="字段的配置方式"
               placement="top"
             >
@@ -31,7 +31,7 @@
           >
             <el-tooltip
               slot="label"
-              effect="dark"
+              effect="light"
               content="使用接口的出参配置可选字段"
               placement="top"
             >
@@ -83,7 +83,7 @@
           <el-form-item>
             <el-tooltip
               slot="label"
-              effect="dark"
+              effect="light"
               content="一般用于编辑和详情的数据回显"
               placement="top"
             >

package/packages/FormMaking/WidgetConfig.vue

@@ -13,7 +13,7 @@
           <el-form-item>
             <el-tooltip
               slot="label"
-              effect="dark"
+              effect="light"
               content="切换组件会导致该组件配置信息重置，请谨慎使用！"
               placement="top"
             >
@@ -37,7 +37,7 @@
           <el-form-item required v-if="config.fieldsType === 'fieldsApi'">
             <el-tooltip
               slot="label"
-              effect="dark"
+              effect="light"
               content="组件关联数据表中的唯一字段"
               placement="top"
             >
@@ -60,7 +60,7 @@
           <el-form-item>
             <el-tooltip
               slot="label"
-              effect="dark"
+              effect="light"
               content="表单提交时的入参名，对应数据表中的字段，非必要不修改！"
               placement="top"
             >

package/packages/FormMaking/index.vue

@@ -418,7 +418,7 @@ export default {
           }
           if (
             this.formConfig.config.fieldsType === "fieldsApi" &&
-            !this.formConfig.config.fieldsApi
+            !this.formConfig.config.fieldsApi 
           ) {
             this.$message.warning("请选择字段接口");
             return reject();

package/packages/TableMaking/custom/config.js

@@ -6,10 +6,8 @@ export const search = {
 
 // 列表配置
 export const table = {
-  mounted: {
-    api: ""
-  },
   fieldsType: "fieldsApi",
+  mounted: { api: "" },
   options: [],
   pageInfo: {
     show: true,
@@ -18,7 +16,15 @@ export const table = {
       pageSize: 20,
       currentPage: 1,
       total: 0,
-      sizes: [10, 20, 30, 50, 100]
+      sizes: [10, 20, 50, 100],
+      layout: "total,sizes,prev,pager,next,jumper"
+    },
+    style: {
+      small: false,
+      background: false,
+      disabled: false,
+      hideOnSinglePage: false,
+      align: "right"
     }
   },
   sort: {
@@ -40,6 +46,8 @@ export const table = {
     table: {
       border: true,
       height: "",
+      maxHeight: "",
+      customStyle: ""
     },
     cell: {
       customStyle: "",
@@ -63,7 +71,8 @@ export const table = {
       "text-align": "",
       color: "#333"
     }
-  }
+  },
+  title: ""
 };
 
 // 按钮配置

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

@@ -0,0 +1,118 @@
+<template>
+  <div class="generateTable-action" @click.stop>
+    <template v-for="(item, index) in options">
+      <el-popover
+        v-if="item.type === 'delete'"
+        v-model="pop"
+        :key="index"
+        placement="top"
+        width="180"
+        trigger="manual"
+      >
+        <p>{{ item.delmsg || msg }}</p>
+        <div style="text-align: right; margin: 0">
+          <el-button type="text" :disabled="loadingDel" @click="handleCancel"
+            >取消</el-button
+          >
+          <el-button
+            type="text"
+            :loading="loadingDel"
+            @click="handleDelete(item)"
+            >确定</el-button
+          >
+        </div>
+        <el-button
+          slot="reference"
+          :style="item.style.customStyle"
+          :type="item.style.type"
+          :icon="item.style.icon"
+          :plain="item.style.plain"
+          :round="item.style.round"
+          :circle="item.style.circle"
+          :size="item.style.size"
+          :disabled="item.style.disabled || loadingDel"
+          :loading="item.style.loading"
+          @click="pop = true"
+          >{{ item.name }}</el-button
+        >
+      </el-popover>
+      <el-button
+        v-else
+        :key="index"
+        :style="item.style.customStyle"
+        :type="item.style.type"
+        :icon="item.style.icon"
+        :plain="item.style.plain"
+        :round="item.style.round"
+        :circle="item.style.circle"
+        :size="item.style.size"
+        :disabled="item.style.disabled"
+        :loading="item.style.loading"
+        @click="handleClick(item)"
+        >{{ item.name }}</el-button
+      >
+    </template>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "ThTableAction",
+  props: {
+    options: Array,
+    scope: Object | String,
+    permission: {
+      type: Object,
+      required: false
+    },
+    msg: {
+      type: String,
+      default: "确定删除本条数据吗？"
+    }
+  },
+  data() {
+    return {
+      pop: false,
+      loadingDel: false
+    };
+  },
+  methods: {
+    handleCancel() {
+      this.loadingDel = false;
+      this.pop = false;
+    },
+    handleClick(item, callback) {
+      this.$emit("click", item, this.scope.row, callback);
+    },
+    handleDelete(item) {
+      this.loadingDel = true;
+      const callback = bool => {
+        bool ? this.handleCancel() : (this.loadingDel = false);
+      };
+      this.handleClick(item, callback);
+    },
+    handleMore(value, index, item) {
+      for (let i = 0; i < item.children.length; i++) {
+        const element = item.children[i];
+        if (element.type === value) {
+          this.handleClick(element);
+          break;
+        }
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+.generateTable-action {
+  width: 100%;
+  display: flex;
+  align-items: center;
+  justify-content: space-around;
+
+  .el-button + .el-button {
+    margin-left: 0px;
+  }
+}
+</style>

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

@@ -4,16 +4,38 @@
       :style="config.style.table.customStyle"
       :data="data"
       :border="config.style.table.border"
-      :height="config.style.table.height"
+      :height="config.style.table.height || null"
+      :empty-text="config.empty.text"
+      v-loading="config.loading.show"
+      :element-loading-text="config.loading.text"
     >
-      <el-table-column
-        v-for="item in config.options"
-        :key="item.prop"
-        :prop="item.prop"
-        :label="item.label"
-        :width="item.width || 180"
-      >
-      </el-table-column>
+      <template v-for="item in config.options">
+        <el-table-column
+          v-if="item.type"
+          :key="item.prop"
+          :type="item.type"
+          :label="item.label"
+          :width="item.width || 50"
+        >
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="item.prop"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width || 180"
+        >
+          <template slot-scope="scope">
+            <slot
+              v-if="item.slot"
+              :name="item.slot"
+              :scope="scope"
+              :option="item"
+            />
+            <span v-else>{{ scope.row[item.prop] }}</span>
+          </template>
+        </el-table-column>
+      </template>
     </el-table>
   </div>
 </template>
@@ -22,15 +44,18 @@
 export default {
   props: {
     data: Array,
-    config: Object
+    config: {
+      type: Object,
+      default: () => {
+        return { style: {} };
+      }
+    }
   },
   data() {
     return {};
   },
   created() {},
-  mounted() {
-    console.log(this.config)
-  },
+  mounted() {},
   methods: {}
 };
 </script>