xianniu-ui 0.1.10-beta → 0.1.11-beta

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xianniu-ui",
-  "version": "0.1.10-beta",
+  "version": "0.1.11-beta",
   "private": false,
   "main": "lib/xianniu-ui.umd.min.js",
   "scripts": {

package/packages/table/main.vue

@@ -113,101 +113,14 @@
       </el-table-column>
       <el-table-column
         width="50px"
-        label="序号"
+        label="No."
         v-if="index && data.length"
         type="index"
       ></el-table-column>
 
-      <slot name="column">
-        <template v-for="(item, idx) in columns">
-          <el-table-column
-            v-bind="item"
-            v-on="$listeners"
-            :key="idx"
-            v-if="isShowColumn(item)"
-          >
-            <template v-if="item.labelMsg">
-              <template slot="header">
-                <el-tooltip
-                  class="item"
-                  effect="dark"
-                  :content="item.labelMsg"
-                  placement="right"
-                >
-                  <span>{{ item.label }} <i class="el-icon-question"></i></span>
-                </el-tooltip>
-              </template>
-            </template>
-            <template slot-scope="{ row, $index }">
-              <expandDom
-                v-if="item.render"
-                :column="row"
-                :row="row"
-                :render="item.render"
-                :index="$index"
-              ></expandDom>
-              <template v-else>
-                {{ row[item.prop] }}
-              </template>
-              <!-- 更多操作 -->
-              <template v-if="item.more && item.more.options.length">
-                <template v-for="(itemBtn, idxBtn) in item.more.options">
-                  <expand-dom
-                    v-if="itemBtn.render && itemBtn.show && itemBtn.show(row)"
-                    :key="idxBtn"
-                    :column="itemBtn"
-                    :row="row"
-                    :render="itemBtn.render"
-                    :index="idxBtn"
-                  />
-                  <template v-else>
-                    <el-popconfirm
-                      v-if="itemBtn.isPopConfirm"
-                      :title="
-                        itemBtn.options.title ||
-                        `确定${label(itemBtn, row)}吗？`
-                      "
-                      :key="idxBtn"
-                      :confirm-button-text="itemBtn.options.confirmButtonText"
-                      class="ml-10"
-                      @confirm="handleClick(itemBtn.method, row, $index)"
-                    >
-                      <el-button
-                        :type="itemBtn.type || 'text'"
-                        :size="itemBtn.size || 'mini'"
-                        :icon="itemBtn.icon"
-                        :plain="itemBtn.plain"
-                        slot="reference"
-                        >{{ label(itemBtn, row) }}</el-button
-                      >
-                    </el-popconfirm>
-                    <template v-else>
-                      <el-button
-                        v-if="itemBtn.show ? itemBtn.show(row) : true"
-                        :key="idxBtn"
-                        :disabled="
-                          itemBtn.disabled ? itemBtn.disabled(row) : false
-                        "
-                        :type="itemBtn.type || 'text'"
-                        :size="itemBtn.size || 'mini'"
-                        :icon="itemBtn.icon"
-                        :plain="itemBtn.plain"
-                        @click="handleClick(itemBtn.method, row, $index)"
-                        >{{ label(itemBtn, row) }}</el-button
-                      >
-                    </template>
-                  </template>
-                </template>
-              </template>
-            </template>
-          </el-table-column>
-          <!-- <column
-            :key="idx"
-            v-if="item.checked === true"
-            v-bind="item"
-          ></column> -->
-        </template>
-      </slot>
+      <template v-for="(item, idx) in columns">
+        <column :key="idx" v-if="item.checked === true" v-bind="item"></column>
+      </template>
     </el-table>
 
     <template v-if="!$utils.isEmpty(page)">
@@ -223,30 +136,10 @@
 </template>
 
 <script>
+import column from "./column.vue";
 export default {
   name: "XnTable",
-  components: {
-    expandDom: {
-      functional: true,
-      props: {
-        row: Object,
-        render: Function,
-        index: Number,
-        column: {
-          type: Object,
-          default: null,
-        },
-      },
-      render: (h, ctx) => {
-        const params = {
-          row: ctx.props.row,
-          index: ctx.props.index,
-        };
-        if (ctx.props.column) params.column = ctx.props.column;
-        return ctx.props.render(h, params);
-      },
-    },
-  },
+  components: { column },
   props: {
     tools: {
       type: Array,
@@ -288,23 +181,7 @@ export default {
       selectedData: [],
     };
   },
-  computed: {
-    label() {
-      return (itemBtn, row) => {
-        return typeof itemBtn.label === "function"
-          ? itemBtn.label(row)
-          : itemBtn.label;
-      };
-    },
-    isShowColumn() {
-      return (row) => {
-        if (row.show != undefined) {
-          return typeof row.show === "function" ? row.show() : row.show;
-        }
-        return true;
-      };
-    },
-  },
+  computed: {},
   created() {
     this.columns.length &&
       this.columns.forEach((item) => {
@@ -342,15 +219,6 @@ export default {
     doLayout() {
       this.$refs.table.doLayout();
     },
-    handleClick(method, row, index) {
-      if (this.$parent) {
-        this.$parent.$emit("handle-buttons", {
-          method,
-          row,
-          index,
-        });
-      }
-    },
   },
 };
 </script>