tianheng-ui 0.0.30 → 0.0.33

package/package.json

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

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/column.vue

@@ -38,7 +38,7 @@
         >
           <template slot-scope="scope">
             <slot v-if="item.slot" name="slot" :scope="scope" :option="item" />
-            <div v-else>{{ scope.row[item.prop] }}</div>
+            <span v-else>{{ scope.row[item.prop] }}</span>
           </template>
         </el-table-column>
       </template>

package/packages/table/index.vue

@@ -57,16 +57,16 @@
                 :scope="scope"
                 :option="item"
               />
-              <div v-else-if="item.format">
+              <span 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>
+              </span>
+              <span v-else-if="item.alias">{{ scope.row[item.alias] }}</span>
+              <span v-else>{{ scope.row[item.prop] }}</span>
             </template>
           </el-table-column>
         </template>
@@ -211,7 +211,7 @@ export default {
     handleSizeChange(val) {
       this.pageInfo.pageSize = val;
       this.$emit(
-        "pageNumberChange",
+        "page-number-change",
         this.pageInfo.currentPage,
         this.pageInfo.pageSize
       );
@@ -220,7 +220,7 @@ export default {
     handleCurrentChange(val) {
       this.pageInfo.currentPage = val;
       this.$emit(
-        "pageNumberChange",
+        "page-number-change",
         this.pageInfo.currentPage,
         this.pageInfo.pageSize
       );
@@ -230,7 +230,7 @@ export default {
       if (this.pageInfo.currentPage === 1) return;
       this.pageInfo.currentPage -= 1;
       this.$emit(
-        "pageNumberChange",
+        "page-number-change",
         this.pageInfo.currentPage,
         this.pageInfo.pageSize
       );
@@ -240,7 +240,7 @@ export default {
       if (this.pageInfo.currentPage === this.pageInfo.pageCount) return;
       this.pageInfo.currentPage += 1;
       this.$emit(
-        "pageNumberChange",
+        "page-number-change",
         this.pageInfo.currentPage,
         this.pageInfo.pageSize
       );