htui-yllkbz 1.2.18 → 1.2.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "htui-yllkbz",
-  "version": "1.2.18",
+  "version": "1.2.22",
   "typings": "types/index.d.ts",
   "main": "lib/htui.common.js",
   "style": "lib/htui.css",

package/src/packages/HtTable/index.vue

@@ -5,7 +5,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:23:24
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-12 09:07:39
+ * @LastEditTime: 2021-12-12 11:01:44
 -->
 <template>
   <div v-loading="state.loading">
@@ -43,10 +43,14 @@
                 @cell-click="(row, column, cell, event)=>$emit('cell-click',row, column, cell, event)"
                 @cell-dblclick="(row, column, cell, event)=>$emit('cell-dblclick',row, column, cell, event)">
         <el-table-column width="55"
+                         v-if="checked"
+                         :reserve-selection="reserveSelection"
+                         :selectable="selectable"
                          type='selection'>
         </el-table-column>
         <el-table-column v-if="!hideOrder"
                          label="序号"
+                         :align="'center'"
                          width="55">
           <template slot="header">
             <slot :name="'header_order'"></slot>
@@ -57,15 +61,48 @@
         </el-table-column>
         <el-table-column :label="item.title"
                          :key='item.key'
+                         :fixed="item.fixed"
+                         :align="item.align"
+                         :header-align="item.headerAlign"
+                         :column-key="item.columnKey"
+                         :class-name="item.className"
                          v-for="item in columns"
                          :show-overflow-tooltip="true"
                          :prop="item.key"
-                         :width="item.width||120">
+                         :sortable="item.sortable"
+                         :sort-method="item.sortMethod"
+                         :sort-orders="item.sortOrders"
+                         :formatter="item.formatter"
+                         :sort-by="item.sortBy"
+                         :min-width="item.minWidth"
+                         :width="item.width">
           <template slot-scope="{row,column,rowIndex}">
             <slot :name="item.key"
                   :row="row"
                   :column="column"
-                  :rowIndex="rowIndex">{{getPropByPath(row,item.key)}}</slot>
+                  :rowIndex="rowIndex">
+              <!-- 处理部门 -->
+              <template v-if="item.type==='org'">
+                <common-org-info v-if="getPropByPath(row,item.key)"
+                                 :org-id="getPropByPath(row,item.key)"
+                                 type="tag"></common-org-info>
+              </template>
+              <!-- 处理部门人员 -->
+              <template v-else-if="item.type==='userId'">
+                <div is='common-datas-info-id'
+                     v-if="getPropByPath(row,item.key)"
+                     :user-id="JSON.stringify(getPropByPath(row,item.key))"
+                     :base-data-info='true'></div>
+                <span v-else>--</span>
+              </template>
+              <!-- 处理时间 -->
+              <template v-else-if="item.type==='time'">
+                <span v-if='getPropByPath(row,item.key)'>{{getPropByPath(row,item.key).replace('T', ' ').slice(0,19)}}</span>
+                <span v-else>--</span>
+              </template>
+              <!-- 其他 -->
+              <span v-else>{{getPropByPath(row,item.key)}}</span>
+            </slot>
 
           </template>
           <template slot-scope="{column,$index}"
@@ -113,6 +150,10 @@ export default class HtTable extends Vue {
   @Prop() data!: any[];
   /** 是否隐藏分页 */
   @Prop() hidePage!: boolean;
+  /** 是否启用复选框 */
+  @Prop() checked!: boolean;
+  /**  仅对 type=selection 的列有效，类型为 Boolean，为 true 则会在数据更新之后保留之前选中的数据（需指定 row-key） */
+  @Prop() reserveSelection!: boolean;
   @Prop() height?: string | number;
   @Prop() maxHeight?: string | number;
   @Prop() rowKey?: string;
@@ -122,6 +163,8 @@ export default class HtTable extends Vue {
   @Prop() fit?: boolean;
   @Prop() showHeader?: boolean;
   @Prop() rowClassName?: any;
+  /**    仅对 type=selection 的列有效，类型为 Function，Function 的返回值用来决定这一行的 CheckBox 是否可以勾选 */
+  @Prop() selectable?: any;
   @Prop() currentRowKey?: string | number;
   @Prop() highlightCurrentRow?: boolean;
   @Prop() rowStyle?: any;

package/src/packages/SelectTable/index.vue

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-11 11:06:51
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-08 11:29:19
+ * @LastEditTime: 2021-12-12 10:07:34
 -->
 <template>
   <el-popover placement="bottom"
@@ -182,7 +182,7 @@ export default class HtSelectTable extends Vue {
     //
     if (!this.state.config.disabled) {
       const ref: any = this.$refs[this.state.config.key || "ht-table"];
-      console.log("333");
+
       this.state.visible = false;
       ref.clearCheck();
     }