tianheng-ui 0.0.56 → 0.0.58

package/packages/{table → Table}/action.vue

@@ -3,8 +3,8 @@
     <template v-for="(item, index) in actions">
       <el-popover
         v-if="item.act === 'delete' && !btnHide(item)"
-        :key="index"
         v-model="pop"
+        :key="index"
         placement="top"
         width="180"
         trigger="manual"

package/packages/Table/column.vue

@@ -0,0 +1,63 @@
+<template>
+  <div>
+    <template v-for="(item, index) in options">
+      <template v-if="!item.hide">
+        <el-table-column
+          v-if="item.type"
+          :key="index"
+          :type="item.type"
+          :label="item.label"
+          width="50"
+        >
+        </el-table-column>
+        <el-table-column
+          v-else-if="item.children"
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          :align="item.align"
+          :fixed="item.fixed"
+          :sortable="item.sortable"
+          :sort-method="item.sortMethod"
+          :show-overflow-tooltip="item.showOverflowTooltip"
+        >
+          <TableColumn :key="index" :options="item.children"></TableColumn>
+        </el-table-column>
+        <el-table-column
+          v-else
+          :key="index"
+          :prop="item.prop"
+          :label="item.label"
+          :width="item.width"
+          :align="item.align"
+          :fixed="item.fixed"
+          :sortable="item.sortable"
+          :sort-method="item.sortMethod"
+          :show-overflow-tooltip="item.showOverflowTooltip"
+        >
+          <template slot-scope="scope">
+            <slot v-if="item.slot" name="slot" :scope="scope" :option="item" />
+            <span v-else>{{ scope.row[item.prop] }}</span>
+          </template>
+        </el-table-column>
+      </template>
+    </template>
+  </div>
+</template>
+
+<script>
+export default {
+  name: "TableColumn",
+  props: {
+    options: {
+      type: Array,
+      default: () => {
+        return [];
+      }
+    }
+  }
+};
+</script>
+
+<style></style>

package/packages/{table → Table}/index.vue

@@ -8,7 +8,7 @@
       :row-key="rowKey"
       :stripe="stripe"
       :border="border"
-      :highlight-current-row="selectType === 'single'"
+      :highlight-current-row="highlightCurrentRow"
       :tree-props="treeProps"
       :span-method="objectSpanMethod"
       @current-change="handleSingleSelect"
@@ -35,7 +35,7 @@
             :fixed="item.fixed || null"
             :sortable="item.sortable"
             :sort-method="item.sortMethod"
-            show-overflow-tooltip
+            :show-overflow-tooltip="item.showOverflowTooltip"
           >
             <table-column :options="item.children"></table-column>
           </el-table-column>
@@ -49,7 +49,7 @@
             :fixed="item.fixed || null"
             :sortable="item.sortable"
             :sort-method="item.sortMethod"
-            show-overflow-tooltip
+            :show-overflow-tooltip="item.showOverflowTooltip"
           >
             <template slot-scope="scope">
               <slot
@@ -75,18 +75,24 @@
           </el-table-column>
         </template>
       </template>
-      <!-- <table-column :options="options">
-        <template #slot="{ scope,option }">
-          <slot :name="option.slot" :scope="scope" :option="option" />
-        </template>
-      </table-column> -->
       <template #empty>
         <div>
           {{ loading ? loadingText || "加载中" : emptyText || "暂无数据" }}
         </div>
       </template>
     </el-table>
-    <!-- <i class="th-table-more el-icon-setting"></i> -->
+
+    <!-- <el-popover placement="top-start" title="标题" width="200" trigger="hover">
+      <i class="th-table-more el-icon-s-tools" slot="reference"></i>
+      <div>
+        <el-checkbox
+          v-for="item in options"
+          :key="item.prop"
+          :label="item.label"
+          :checked="!item.hide"
+        ></el-checkbox>
+      </div>
+    </el-popover> -->
 
     <div v-if="Object.keys(pageInfo).length > 0 && showPage" class="pagination">
       <el-pagination
@@ -125,13 +131,6 @@ export default {
         return [];
       }
     },
-    // single:单行选中    multiple:多行选中
-    selectType: {
-      type: String,
-      default: () => {
-        return "single";
-      }
-    },
     // 行双击事件
     dblclick: {
       type: Function,
@@ -165,12 +164,7 @@ export default {
       }
     },
     height: String | Number,
-    rowKey: {
-      type: String,
-      default: () => {
-        return "";
-      }
-    },
+    rowKey: String | Function,
     showPage: {
       type: Boolean,
       default: () => {
@@ -194,6 +188,13 @@ export default {
       default: () => {
         return false;
       }
+    },
+    // 是否要高亮当前行
+    highlightCurrentRow: {
+      type: Boolean,
+      default: () => {
+        return false;
+      }
     }
   },
   data() {
@@ -208,7 +209,7 @@ export default {
     // 选中行--单选
     handleSingleSelect(currentRow, oldCurrentRow) {
       if (currentRow) {
-        this.$emit("select-row-change", currentRow);
+        this.$emit("current-change", currentRow);
       }
     },
     // 每页展示的条数 改变时
@@ -315,6 +316,7 @@ export default {
     position: absolute;
     top: 13px;
     right: 5px;
+    z-index: 999;
     cursor: pointer;
   }
 }

package/packages/{table → Table}/search.vue

@@ -1,8 +1,8 @@
 <template>
   <div class="th-table-search">
     <div
-      class="th-table-search-item"
       v-for="(item, index) in options"
+      class="th-table-search-item"
       :key="index"
     >
       <span class="th-table-search-item-title">{{ item.options.name }}：</span>
@@ -18,7 +18,7 @@
         v-if="item.type === 'date'"
         v-model="params[item.options.prop]"
         :style="{ width: item.options.width + 'px' }"
-        :type="item.options.type || 'date'"
+        :type="item.options.dateType || 'date'"
         :format="item.options.format"
         :value-format="item.options.valueFormat"
         range-separator="至"

package/packages/Workflow/Log.js

@@ -0,0 +1,99 @@
+function Log() {}
+
+Log.prototype.type = ["primary", "success", "warn", "error", "info"];
+
+Log.prototype.typeColor = function(type) {
+  let color = "";
+  switch (type) {
+    case "primary":
+      color = "#2d8cf0";
+      break;
+    case "success":
+      color = "#19be6b";
+      break;
+    case "info":
+      color = "#909399";
+      break;
+    case "warn":
+      color = "#ff9900";
+      break;
+    case "error":
+      color = "#f03f14";
+      break;
+    default:
+      color = "#35495E";
+      break;
+  }
+  return color;
+};
+
+Log.prototype.isArray = function(obj) {
+  return Object.prototype.toString.call(obj) === "[object Array]";
+};
+
+Log.prototype.print = function(text, type = "default", back = false) {
+  if (typeof text === "object") {
+    // 如果是對象則調用打印對象方式
+    this.isArray(text) ? console.table(text) : console.dir(text);
+    return;
+  }
+  if (back) {
+    // 如果是打印帶背景圖的
+    console.log(`%c ${text} `, `background:${this.typeColor(type)}; padding: 2px; border-radius: 4px; color: #fff;`);
+  } else {
+    console.log(
+      `%c ${text} `,
+      `border: 1px solid ${this.typeColor(type)};
+        padding: 2px; border-radius: 4px;
+        color: ${this.typeColor(type)};`
+    );
+  }
+};
+
+Log.prototype.printBack = function(type = "primary", title) {
+  this.print(type, title, true);
+};
+
+Log.prototype.pretty = function(type = "primary", title, text) {
+  if (typeof text === "object") {
+    console.group("Console Group", title);
+    console.log(
+      `%c ${title}`,
+      `background:${this.typeColor(type)};border:1px solid ${this.typeColor(type)};
+        padding: 1px; border-radius: 4px; color: #fff;`
+    );
+    this.isArray(text) ? console.table(text) : console.dir(text);
+    console.groupEnd();
+    return;
+  }
+  console.log(
+    `%c ${title} %c ${text} %c`,
+    `background:${this.typeColor(type)};border:1px solid ${this.typeColor(type)};
+      padding: 1px; border-radius: 4px 0 0 4px; color: #fff;`,
+    `border:1px solid ${this.typeColor(type)};
+      padding: 1px; border-radius: 0 4px 4px 0; color: ${this.typeColor(type)};`,
+    "background:transparent"
+  );
+};
+
+Log.prototype.prettyPrimary = function(title, ...text) {
+  text.forEach(t => this.pretty("primary", title, t));
+};
+
+Log.prototype.prettySuccess = function(title, ...text) {
+  text.forEach(t => this.pretty("success", title, t));
+};
+
+Log.prototype.prettyWarn = function(title, ...text) {
+  text.forEach(t => this.pretty("warn", title, t));
+};
+
+Log.prototype.prettyError = function(title, ...text) {
+  text.forEach(t => this.pretty("error", title, t));
+};
+
+Log.prototype.prettyInfo = function(title, ...text) {
+  text.forEach(t => this.pretty("info", title, t));
+};
+
+export default new Log();