tianheng-ui 0.0.26 → 0.0.29

package/package.json

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

package/packages/table/action.vue

@@ -183,8 +183,4 @@ export default {
     margin-left: 0px;
   }
 }
-
-// .el-button + .action-popover {
-//   margin-left: 10px !important;
-// }
 </style>

package/packages/table/index.vue

@@ -57,6 +57,14 @@
                 :scope="scope"
                 :option="item"
               />
+              <div v-else-if="item.format">
+                {{
+                  handleFormatTime(
+                    scope.row[item.alias || item.prop],
+                    item.format
+                  )
+                }}
+              </div>
               <div v-else-if="item.alias">{{ scope.row[item.alias] }}</div>
               <div v-else>{{ scope.row[item.prop] }}</div>
             </template>
@@ -239,6 +247,50 @@ export default {
     },
     getTable() {
       return this.$refs["th_table"];
+    },
+    handleFormatTime(time, cFormat) {
+      if (arguments.length === 0) {
+        return null;
+      }
+      const format = cFormat || "yyyy-MM-dd HH:mm:ss";
+      let date;
+      if (typeof time === "undefined" || time === null || time === "null") {
+        return "";
+      } else if (typeof time === "object") {
+        date = time;
+      } else {
+        if (typeof time === "string" && /^[0-9]+$/.test(time)) {
+          time = parseInt(time);
+        }
+        if (typeof time === "number" && time.toString().length === 10) {
+          time = time * 1000;
+        }
+        date = new Date(time);
+      }
+      const formatObj = {
+        yyyy: date.getFullYear(),
+        MM: date.getMonth() + 1,
+        dd: date.getDate(),
+        HH: date.getHours(),
+        mm: date.getMinutes(),
+        ss: date.getSeconds(),
+        a: date.getDay()
+      };
+      const time_str = format.replace(
+        /(yyyy|MM|dd|HH|mm|ss|a)/g,
+        (result, key) => {
+          let value = formatObj[key];
+          // Note: getDay() returns 0 on Sunday
+          if (key === "a") {
+            return ["日", "一", "二", "三", "四", "五", "六"][value];
+          }
+          if (result.length > 0 && value < 10) {
+            value = "0" + value;
+          }
+          return value || 0;
+        }
+      );
+      return time_str;
     }
   }
 };

package/packages/table/tools.js

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

package/packages/table/tools.vue

@@ -1,54 +1,22 @@
 <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>
 
 <script>
 export default {
-  name: "ThTableTools",
+  name: "ThTools",
   props: {
     options: {
       type: Array,
@@ -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>