tianheng-ui 0.0.33 → 0.0.36

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tianheng-ui",
   "description": "A Vue.js project",
-  "version": "0.0.33",
+  "version": "0.0.36",
   "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,90 @@
+<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
+            class="th-dialog__action_item"
+            v-if="showFullscreen"
+            :class="fullscreenIcon"
+            @click="handleFullscreenChange"
+          ></i>
+          <i
+            class="th-dialog__action_item "
+            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/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;
   }