tianheng-ui 0.0.27 → 0.0.30

package/package.json

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

package/packages/table/action.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="thTable-action" @click.stop>
+  <div class="th-table-action" @click.stop>
     <template v-for="(item, index) in actions">
       <el-button
         v-if="item.act === 'edit'"
@@ -173,7 +173,7 @@ export default {
 </script>
 
 <style lang="less">
-.thTable-action {
+.th-table-action {
   width: 100%;
   display: flex;
   align-items: center;
@@ -183,8 +183,4 @@ export default {
     margin-left: 0px;
   }
 }
-
-// .el-button + .action-popover {
-//   margin-left: 10px !important;
-// }
 </style>

package/packages/table/index.vue

@@ -249,7 +249,6 @@ export default {
       return this.$refs["th_table"];
     },
     handleFormatTime(time, cFormat) {
-      console.log(time, cFormat);
       if (arguments.length === 0) {
         return null;
       }

package/packages/table/search.js

@@ -0,0 +1,8 @@
+import TableSearch from "./search.vue";
+
+/* istanbul ignore next */
+TableSearch.install = function(Vue) {
+  Vue.component(TableSearch.name, TableSearch);
+};
+
+export default TableSearch;

package/packages/table/search.vue

@@ -1,45 +1,47 @@
 <template>
-  <div class="table-search">
+  <div class="th-table-search">
     <template v-for="(item, index) in options">
-      <el-input
+      <div
+        class="th-table-search-item"
         v-if="item.type === 'input'"
-        class="table-search-item"
-        v-model="params[item.value]"
         :key="index"
-        :style="{ width: item.width + 'px' }"
-        :placeholder="item.placeholder || '请输入'"
-        :size="item.size || 'mini'"
-        clearable
-      ></el-input>
-      <el-date-picker
+      >
+        <span class="th-table-search-item-title">{{ item.props.label }}：</span>
+        <el-input
+          v-model="params[item.props.prop]"
+          :style="{ width: item.width + 'px' }"
+          :placeholder="item.placeholder || '请输入'"
+          :size="item.size"
+          clearable
+        ></el-input>
+      </div>
+      <div
+        class="th-table-search-item"
         v-if="item.type === 'date'"
-        class="table-search-item"
-        v-model="params[item.value]"
         :key="index"
-        :style="{ width: item.width + 'px' }"
-        :type="item.dateType || 'date'"
-        :format="item.format"
-        :value-format="item.valueFormat"
-        :size="item.size || 'mini'"
-        range-separator="至"
-        start-placeholder="开始日期"
-        end-placeholder="结束日期"
       >
-      </el-date-picker>
+        <span class="th-table-search-item-title">{{ item.props.label }}：</span>
+        <el-date-picker
+          v-model="params[item.props.prop]"
+          :style="{ width: item.width + 'px' }"
+          :type="item.dateType || 'date'"
+          :format="item.format"
+          :value-format="item.valueFormat"
+          :size="item.size"
+          range-separator="至"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+        >
+        </el-date-picker>
+      </div>
     </template>
 
-    <el-button
-      type="primary"
-      icon="el-icon-search"
-      size="mini"
-      plain
-      @click="doSearch"
+    <el-button type="primary" icon="el-icon-search" plain @click="doSearch"
       >查询</el-button
     >
     <el-button
       type="primary"
       icon="el-icon-refresh-right"
-      size="mini"
       plain
       @click="doReset"
       >重置</el-button
@@ -84,7 +86,6 @@ export default {
       this.$emit("on-search", this.params);
     },
     doReset() {
-      this.params = {};
       this.$emit("on-reset", this.params);
     }
   }
@@ -92,15 +93,16 @@ export default {
 </script>
 
 <style lang="less" scoped>
-.table-search {
+.th-table-search {
   display: flex;
   align-items: center;
-  margin-bottom: 10px;
+  margin-bottom: 20px;
   &-item {
-    margin-right: 10px;
+    display: inline-block;
+    margin-right: 15px;
+  }
+  .th-table-search-item:last-child {
+    margin-right: 20px !important;
   }
-}
-.table-search-item:last-child {
-  margin-right: 20px !important;
 }
 </style>

package/packages/table/tools.js

@@ -0,0 +1,8 @@
+import TableTools from "./tools.vue";
+
+/* istanbul ignore next */
+TableTools.install = function(Vue) {
+  Vue.component(TableTools.name, TableTools);
+};
+
+export default TableTools;

package/packages/table/tools.vue

@@ -1,48 +1,16 @@
 <template>
-  <div class="tableTools">
-    <template v-for="(item, index) in options">
-      <el-button
-        v-if="item.act_type === 'add'"
-        :key="index"
-        :style="{ color: item.btn_color }"
-        :type="item.btn_type"
-        :icon="item.btn_icon"
-        :disabled="item.btn_disabled"
-        @click="doAdd(item)"
-        >{{ item.btn_name }}</el-button
-      >
-      <el-button
-        v-if="item.act_type === 'refresh'"
-        :key="index"
-        :style="{ color: item.btn_color }"
-        :type="item.btn_type"
-        :icon="item.btn_icon"
-        :disabled="item.btn_disabled"
-        @click="doRefresh(item)"
-        >{{ item.btn_name }}</el-button
-      >
-      <el-button
-        v-if="item.act_type === 'export'"
-        :key="index"
-        :style="{ color: item.btn_color }"
-        :type="item.btn_type"
-        :icon="item.btn_icon"
-        :disabled="item.btn_disabled"
-        @click="doExport(item)"
-        >{{ item.btn_name }}</el-button
-      >
-      <el-button
-        v-if="item.act_type === 'batch'"
-        :key="index"
-        :style="{ color: item.btn_color }"
-        :type="item.btn_type"
-        :icon="item.btn_icon"
-        :disabled="item.btn_disabled || selectionDisabled"
-        :loading="loadingDel"
-        @click="doBatch(item)"
-        >{{ item.btn_name }}</el-button
-      >
-    </template>
+  <div class="th-tools">
+    <el-button
+      v-for="(item, index) in options"
+      :key="index"
+      :style="item.style"
+      :type="item.type"
+      :icon="item.icon"
+      :disabled="item.disabled || disabled[item.act]"
+      :loading="item.loading"
+      @click="handleClick(item)"
+      >{{ item.name }}</el-button
+    >
   </div>
 </template>
 
@@ -56,44 +24,26 @@ export default {
         return [];
       }
     },
-    selectionDisabled: {
-      type: Boolean,
+    disabled: {
+      type: Object,
       default: () => {
-        return true;
+        return {};
       }
     }
   },
   data() {
-    return {
-      loadingDel: false
-    };
+    return {};
   },
   methods: {
-    doEval(item) {
-      this.$emit("on-eval", item);
-    },
-    doAdd(item) {
-      this.$emit("on-add", item);
-    },
-    doRefresh(item) {
-      this.$emit("on-refresh", item);
-    },
-    doExport(item) {
-      this.$emit("on-export", item);
-    },
-    doBatch(item) {
-      this.loadingDel = true;
-      const callback = bool => {
-        this.loadingDel = false;
-      };
-      this.$emit("on-batch", item, callback);
+    handleClick(item) {
+      this.$emit("on-click", item);
     }
   }
 };
 </script>
 
-<style lang="less">
-.tableTools {
+<style lang="less" scoped>
+.th-tools {
   margin-bottom: 10px;
 }
 </style>