tianheng-ui 0.0.32 → 0.0.35

package/package.json

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

package/packages/dialog/index.js

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

package/packages/dialog/index.vue

@@ -0,0 +1,84 @@
+<template>
+  <el-dialog
+    class="th-dialog"
+    :visible.sync="visible"
+    :fullscreen="dialogFullscreen"
+    :close-on-click-modal="false"
+    :show-close="false"
+    :before-close="handleClose"
+  >
+    <div slot="title" style="font-size: 14px;">
+      <div slot="title" class="th-dialog__header">
+        <div class="th-dialog__title">{{ title }}</div>
+        <div class="th-dialog__action">
+          <i
+            v-if="showFullscreen"
+            :class="fullscreenIcon"
+            @click="handleFullscreenChange"
+          ></i>
+          <i v-if="showClose" :class="closeIcon" @click="handleClose"></i>
+        </div>
+      </div>
+    </div>
+    <slot></slot>
+    <span slot="footer">
+      <el-button
+        v-if="showAffirm"
+        type="primary"
+        :loading="loading"
+        @click="handleAffirm"
+        >{{ affirmText }}</el-button
+      >
+      <el-button v-if="showCancel" @click="handleClose">{{
+        cancelText
+      }}</el-button>
+    </span>
+  </el-dialog>
+</template>
+
+<script>
+export default {
+  name: "ThDialog",
+  props: {
+    visible: Boolean,
+    loading: Boolean,
+    title: { type: String, default: "温馨提示" },
+
+    showAffirm: { type: Boolean, default: true },
+    affirmText: { type: String, default: "确 认" },
+
+    showCancel: { type: Boolean, default: true },
+    cancelText: { type: String, default: "取 消" },
+
+    showClose: { type: Boolean, default: true },
+    closeIcon: { type: String, default: "el-icon-close" },
+
+    fullscreen: { type: Boolean, default: false },
+    showFullscreen: { type: Boolean, default: true },
+    fullscreenIcon: { type: String, default: "el-icon-full-screen" }
+  },
+  data() {
+    return {
+      formRules: {},
+      dialogFullscreen: this.fullscreen
+    };
+  },
+  watch: {
+    fullscreen(value) {
+      this.dialogFullscreen = value;
+    }
+  },
+  methods: {
+    handleClose() {
+      this.$emit("on-close");
+    },
+    handleAffirm() {
+      this.$emit("on-affirm");
+    },
+    handleFullscreenChange() {
+      this.dialogFullscreen = !this.dialogFullscreen;
+      this.$emit("fullscreen-change");
+    }
+  }
+};
+</script>

package/packages/table/action.vue

@@ -1,42 +1,23 @@
 <template>
   <div class="th-table-action" @click.stop>
     <template v-for="(item, index) in actions">
-      <el-button
-        v-if="item.act === 'edit'"
-        :key="index"
-        :style="item.style"
-        :type="item.type"
-        :icon="item.icon"
-        :disabled="btnDisabled(item)"
-        @click="doEdit(item)"
-        >{{ item.name }}</el-button
-      >
-      <el-button
-        v-else-if="item.act === 'look'"
-        :key="index"
-        :style="item.style"
-        :type="item.type"
-        :icon="item.icon"
-        :disabled="btnDisabled(item)"
-        @click="doLook(item)"
-        >{{ item.name }}</el-button
-      >
       <el-popover
-        class="action-popover"
-        v-else-if="item.act === 'delete'"
+        v-if="item.act === 'delete'"
         :key="index"
         v-model="pop"
         placement="top"
-        title=""
         width="180"
         trigger="manual"
       >
         <p>{{ item.delmsg || msg }}</p>
         <div style="text-align: right; margin: 0">
-          <el-button type="text" :disabled="loadingDel" @click="doCancel"
+          <el-button type="text" :disabled="loadingDel" @click="handleCancel"
             >取消</el-button
           >
-          <el-button type="text" :loading="loadingDel" @click="doDelete(item)"
+          <el-button
+            type="text"
+            :loading="loadingDel"
+            @click="handleDelete(item)"
             >确定</el-button
           >
         </div>
@@ -51,14 +32,14 @@
         >
       </el-popover>
       <el-dropdown
-        v-else-if="item.act === 'more'"
+        v-if="item.act === 'more'"
         :key="index"
         :trigger="item.trigger || 'click'"
         :placement="item.placement || 'bottom-end'"
         :disabled="btnDisabled(item)"
         @command="
           value => {
-            doMore(value, index, item);
+            handleMore(value, index, item);
           }
         "
       >
@@ -88,7 +69,7 @@
         :type="item.type"
         :icon="item.icon"
         :disabled="btnDisabled(item)"
-        @click="doEval(item)"
+        @click="handleClick(item)"
         >{{ item.name }}</el-button
       >
     </template>
@@ -136,34 +117,25 @@ export default {
     }
   },
   methods: {
-    toDelete() {
-      this.pop = true;
-    },
-    doCancel() {
+    handleCancel() {
+      this.loadingDel = false;
       this.pop = false;
     },
-    doEval(item) {
-      this.$emit("on-eval", item);
-    },
-    doEdit(item) {
-      this.$emit("on-edit", item);
-    },
-    doLook(item) {
-      this.$emit("on-look", item);
+    handleClick(item) {
+      this.$emit("on-click", item);
     },
-    doDelete(item) {
+    handleDelete(item) {
       this.loadingDel = true;
       const callback = bool => {
-        this.loadingDel = false;
-        this.pop = !bool;
+        bool ? this.handleCancel() : (this.loadingDel = false);
       };
-      this.$emit("on-delete", item, callback);
+      this.handleClick(item, callback);
     },
-    doMore(value, index, item) {
+    handleMore(value, index, item) {
       for (let i = 0; i < item.children.length; i++) {
         const element = item.children[i];
         if (element.act === value) {
-          this.$emit("on-more", element);
+          this.handleClick(element);
           break;
         }
       }

package/packages/table/index.vue

@@ -10,6 +10,7 @@
       :border="border"
       :highlight-current-row="selectType === 'single'"
       :tree-props="treeProps"
+      :span-method="objectSpanMethod"
       @current-change="handleSingleSelect"
       @row-dblclick="dblclick"
       @selection-change="handleSelectionChange"
@@ -291,6 +292,9 @@ export default {
         }
       );
       return time_str;
+    },
+    objectSpanMethod(data) {
+      this.$emit("span-method", data);
     }
   }
 };
@@ -300,6 +304,7 @@ export default {
 .th-table {
   position: relative;
   width: 100%;
+  height: 100%;
   .pagination {
     margin-top: 20px;
   }