tianheng-ui 0.0.24 → 0.0.27

package/package.json

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

package/packages/empty/index.vue

@@ -8,7 +8,7 @@
       <slot v-if="$slots.description" name="description"></slot>
       <p v-else>{{ description }}</p>
     </div>
-      <div v-if="$slots.default" class="th-empty-bottom">
+    <div v-if="$slots.default" class="th-empty-bottom">
       <slot></slot>
     </div>
   </div>

package/packages/table/action.vue

@@ -53,9 +53,11 @@
       <el-dropdown
         v-else-if="item.act === 'more'"
         :key="index"
-        trigger="click"
+        :trigger="item.trigger || 'click'"
+        :placement="item.placement || 'bottom-end'"
+        :disabled="btnDisabled(item)"
         @command="
-          (value) => {
+          value => {
             doMore(value, index, item);
           }
         "
@@ -74,6 +76,7 @@
             :style="btnItem.style"
             :command="btnItem.act"
             :icon="btnItem.icon"
+            :disabled="btnItem.disabled"
             >{{ btnItem.name }}</el-dropdown-item
           >
         </el-dropdown-menu>
@@ -100,29 +103,29 @@ export default {
       type: Array,
       default: () => {
         return [];
-      },
+      }
     },
     scope: {
-      type: Object | String,
+      type: Object | String
     },
     permission: {
       type: Object,
-      required: false,
+      required: false
     },
     msg: {
       type: String,
-      default: "确定删除本条数据吗？",
-    },
+      default: "确定删除本条数据吗？"
+    }
   },
   data() {
     return {
       pop: false,
-      loadingDel: false,
+      loadingDel: false
     };
   },
   computed: {
     btnDisabled() {
-      return (item) => {
+      return item => {
         if (item.disabled instanceof Boolean) {
           return item.disabled;
         }
@@ -130,7 +133,7 @@ export default {
           return item.disabled(this.scope);
         }
       };
-    },
+    }
   },
   methods: {
     toDelete() {
@@ -150,7 +153,7 @@ export default {
     },
     doDelete(item) {
       this.loadingDel = true;
-      const callback = (bool) => {
+      const callback = bool => {
         this.loadingDel = false;
         this.pop = !bool;
       };
@@ -164,8 +167,8 @@ export default {
           break;
         }
       }
-    },
-  },
+    }
+  }
 };
 </script>
 

package/packages/table/index.vue

@@ -57,6 +57,15 @@
                 :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>
           </el-table-column>
@@ -238,6 +247,51 @@ export default {
     },
     getTable() {
       return this.$refs["th_table"];
+    },
+    handleFormatTime(time, cFormat) {
+      console.log(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;
     }
   }
 };