htui-yllkbz 1.2.23 → 1.2.27

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2021 胡涛
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -4,7 +4,7 @@
  * @Author: hutao
  * @Date: 2021-11-15 14:41:40
  * @LastEditors: hutao
- * @LastEditTime: 2021-12-09 17:47:51
+ * @LastEditTime: 2021-12-12 15:45:01
 -->
 
 # 基础组件整理
@@ -62,6 +62,134 @@ Vue.use(HtUI)
 
 ```
 
+### table 引用部分 table---参照 Table Attributes 和 Table Events
+
+##### 使用 slot 时候保证和 column 的 key 相互对应 slot-header 中的 slot header_key 例如:
+
+```
+<div slot="header_name">测试名字</div>
+```
+
+```
+ <ht-table :data="state.tableData"
+              @onchange='changePage'
+              style="width: 100%"
+              border
+              @sort-change="sortChange"
+              height="calc(100vh - 240px)"
+              highlight-current-row
+              :page-info="{
+                currentPage:state.filterData.currentPage,
+                pageSize:state.filterData.maxResultCount,
+                skipCount:state.filterData.skipCount,
+                totalCount:state.filterData.totalCount,
+              }"
+              :columns="state.columns">
+      <!-- 任务状态 -->
+      <template slot-scope="{row}"
+                slot="state">
+        <el-tag :type="state.filterData.state===5?'danger':state.filterData.state===4?'warning':''"
+                v-if="state.filterData.state===5||state.filterData.state===4">{{row.stateDescription}}</el-tag>
+        <el-tag v-else
+                :style="`color:${fontColor[row.state]}`"
+                :color="getColor[row.state]">{{row.stateDescription}}</el-tag>
+      </template>
+      <!-- 操作 -->
+      <template slot-scope="{ row }"
+                slot="handel">
+        <el-button type="text"
+                   style="margin:0 8px"
+                   @click="approver(row)">
+          详情
+        </el-button>
+        <repository-add-repository-btn v-if="row.state==5"
+                                       type='text'
+                                       :info="JSON.stringify({from:'pm',id:row.id})"></repository-add-repository-btn>
+      </template>
+    </ht-table>
+
+```
+
+### table 配置项---参照 Table-column Attributes
+
+```
+    columns: [
+      {
+        title: "工单名称",
+        hide:true,//是否不渲染此列
+        key: "workOrderName",
+        width: "200px",
+      },
+      {
+        title: "设备名称",
+        key: "devices[0].deviceName",
+        width: 150,
+      },
+      {
+        title: "设备类型",
+        key: "devices[0].deviceType",
+      },
+      {
+        title: "部门",
+        type: "org",
+        key: "mainteabce.organizationUnitId",
+      },
+
+      {
+        title: "执行人",
+        key: "executor",
+        type: "userId",
+      },
+      {
+        title: "运行模型",
+        key: "mainteabce.deviceInstanceModelName",
+      },
+      {
+        title: "设备系统",
+        sortable: "custom",
+        key: "mainteabce.systemTypeName",
+      },
+      {
+        title: "维保名称",
+        key: "mainteabce.name",
+        width: 170,
+      },
+      {
+        title: "计划开始时间",
+        key: "beginTime",
+        width: 150,
+        type: "time",
+        sortable: "custom",
+        align: "center",
+      },
+      {
+        title: "计划结束时间",
+        key: "endTime",
+        width: 150,
+        sortable: "custom",
+        type: "time",
+      },
+      {
+        title: "实际完成时间",
+        key: "realEndTime",
+        width: 150,
+        type: "time",
+        sortable: "custom",
+        align: "center",
+      },
+      {
+        title: "任务状态",
+        key: "state",
+      },
+      {
+        title: "操作",
+        key: "handel",
+        width: 160,
+      },
+    ],
+
+```
+
 ## 代码地址
 
 ### [点我跳转-玉林路扛把子](https://gitee.com/yulin-road-shoulder/htui-yllkbz)

package/lib/htui.common.js

@@ -9335,25 +9335,25 @@ PageInfo.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_PageInfo = (PageInfo);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"46e974bd-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/HtTable/index.vue?vue&type=template&id=28207e06&scoped=true&
-var HtTablevue_type_template_id_28207e06_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.state.loading),expression:"state.loading"}]},[_c('article',[_c('el-table',{ref:"comTable",attrs:{"height":_vm.height,"max-height":_vm.maxHeight,"border":_vm.border,"stripe":_vm.stripe,"size":_vm.size,"fit":_vm.fit,"show-header":_vm.showHeader,"empty-text":_vm.emptyText||'暂无数据',"row-style":_vm.rowStyle,"row-class-name":_vm.rowClassName,"current-row-key":_vm.currentRowKey,"highlight-current-row":_vm.highlightCurrentRow,"row-key":_vm.rowKey||'id',"data":_vm.data,"tooltip-effect":"dark"},on:{"row-click":function (row, column, event){ return _vm.$emit('row-click',row, column, event); },"row-contextmenu":function (row, column, event){ return _vm.$emit('row-contextmenu',row, column, event); },"row-dblclick":function (row, column, event){ return _vm.$emit('row-dblclick',row, column, event); },"header-click":function ( column, event){ return _vm.$emit('header-click', column, event); },"header-contextmenu":function ( column, event){ return _vm.$emit('header-contextmenu', column, event); },"sort-change":function (ref){
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"46e974bd-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/HtTable/index.vue?vue&type=template&id=762ca12f&scoped=true&
+var HtTablevue_type_template_id_762ca12f_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.state.loading),expression:"state.loading"}]},[_c('article',[_c('el-table',{ref:"comTable",attrs:{"height":_vm.height,"max-height":_vm.maxHeight,"border":_vm.border,"stripe":_vm.stripe,"size":_vm.size,"fit":_vm.fit,"show-header":_vm.showHeader,"empty-text":_vm.emptyText||'暂无数据',"row-style":_vm.rowStyle,"row-class-name":_vm.rowClassName,"current-row-key":_vm.currentRowKey,"highlight-current-row":_vm.highlightCurrentRow,"row-key":_vm.rowKey||'id',"data":_vm.data,"tooltip-effect":"dark"},on:{"row-click":function (row, column, event){ return _vm.$emit('row-click',row, column, event); },"row-contextmenu":function (row, column, event){ return _vm.$emit('row-contextmenu',row, column, event); },"row-dblclick":function (row, column, event){ return _vm.$emit('row-dblclick',row, column, event); },"header-click":function ( column, event){ return _vm.$emit('header-click', column, event); },"header-contextmenu":function ( column, event){ return _vm.$emit('header-contextmenu', column, event); },"sort-change":function (ref){
 	var column = ref.column;
 	var prop = ref.prop;
 	var order = ref.order;
 
 	return _vm.$emit('sort-change', { column: column, prop: prop, order: order});
-},"filter-change":function (filter){ return _vm.$emit('filter-change', filter); },"current-change":function (currentRow, oldCurrentRow){ return _vm.$emit('current-change', currentRow, oldCurrentRow); },"select":function (selection, row){ return _vm.$emit('select',selection, row); },"select-all":function (selection){ return _vm.$emit('select-all',selection); },"selection-change":function (selection){ return _vm.$emit('selection-change',selection); },"cell-mouse-enter":function (row, column, cell, event){ return _vm.$emit('cell-mouse-enter',row, column, cell, event); },"cell-mouse-leave":function (row, column, cell, event){ return _vm.$emit('cell-mouse-leave',row, column, cell, event); },"cell-click":function (row, column, cell, event){ return _vm.$emit('cell-click',row, column, cell, event); },"cell-dblclick":function (row, column, cell, event){ return _vm.$emit('cell-dblclick',row, column, cell, event); }}},[(_vm.checked)?_c('el-table-column',{attrs:{"width":"55","reserve-selection":_vm.reserveSelection,"selectable":_vm.selectable,"type":"selection"}}):_vm._e(),(!_vm.hideOrder)?_c('el-table-column',{attrs:{"label":"序号","align":'center',"width":"55"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_vm._v(" "+_vm._s((_vm.state.pageInfo.currentPage-1)*_vm.state.pageInfo.pageSize+(scope.$index+1))+" ")]}}],null,false,2272936552)},[_c('template',{slot:"header"},[_vm._t('header_order')],2)],2):_vm._e(),_vm._l((_vm.columns),function(item){return [(!item.hide)?_c('el-table-column',{key:item.key,attrs:{"label":item.title,"fixed":item.fixed,"align":item.align,"header-align":item.headerAlign,"column-key":item.columnKey,"class-name":item.className,"show-overflow-tooltip":true,"prop":item.key,"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},scopedSlots:_vm._u([{key:"default",fn:function(ref){
+},"filter-change":function (filter){ return _vm.$emit('filter-change', filter); },"current-change":function (currentRow, oldCurrentRow){ return _vm.$emit('current-change', currentRow, oldCurrentRow); },"select":function (selection, row){ return _vm.$emit('select',selection, row); },"select-all":function (selection){ return _vm.$emit('select-all',selection); },"selection-change":function (selection){ return _vm.$emit('selection-change',selection); },"cell-mouse-enter":function (row, column, cell, event){ return _vm.$emit('cell-mouse-enter',row, column, cell, event); },"cell-mouse-leave":function (row, column, cell, event){ return _vm.$emit('cell-mouse-leave',row, column, cell, event); },"cell-click":function (row, column, cell, event){ return _vm.$emit('cell-click',row, column, cell, event); },"cell-dblclick":function (row, column, cell, event){ return _vm.$emit('cell-dblclick',row, column, cell, event); }}},[(_vm.checked)?_c('el-table-column',{attrs:{"width":"55","reserve-selection":_vm.reserveSelection,"selectable":_vm.selectable,"type":"selection"}}):_vm._e(),(!_vm.hideOrder)?_c('el-table-column',{attrs:{"label":_vm.keyName===undefined?'序号':_vm.keyName,"align":'center',"width":"55"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_vm._v(" "+_vm._s((_vm.state.pageInfo.currentPage-1)*_vm.state.pageInfo.pageSize+(scope.$index+1))+" ")]}}],null,false,2272936552)},[_c('template',{slot:"header"},[_vm._t('header_order')],2)],2):_vm._e(),_vm._l((_vm.columns),function(item){return [(!item.hide)?_c('el-table-column',{key:item.key,attrs:{"label":item.title,"fixed":item.fixed,"align":item.align,"header-align":item.headerAlign,"column-key":item.columnKey,"class-name":item.className,"prop":item.key,"show-overflow-tooltip":item.type==='common'||item.type==='org'||item.type==='userId'?false:(item.showOverflowTooltip===false?false:true),"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},scopedSlots:_vm._u([{key:"default",fn:function(ref){
 var row = ref.row;
 var column = ref.column;
 var rowIndex = ref.rowIndex;
-return [_vm._t(item.key,[(item.type==='org')?[(_vm.getPropByPath(row,item.key))?_c('common-org-info',{attrs:{"org-id":_vm.getPropByPath(row,item.key),"type":"tag"}}):_c('span',[_vm._v("--")])]:(item.type==='userId')?[(_vm.getPropByPath(row,item.key))?_c("common-datas-info-id",{tag:"div",attrs:{"user-id":JSON.stringify(_vm.getPropByPath(row,item.key)),"base-data-info":true}}):_c('span',[_vm._v("--")])]:(item.type==='time')?[(_vm.getPropByPath(row,item.key))?_c('span',[_vm._v(_vm._s(_vm.getPropByPath(row,item.key).replace('T', ' ').slice(0,19)))]):_c('span',[_vm._v("--")])]:_c('span',[_vm._v(_vm._s(_vm.getPropByPath(row,item.key)))])],{"row":row,"column":column,"rowIndex":rowIndex})]}},{key:"header",fn:function(ref){
+return [_vm._t(item.key,[(item.type==='org')?[(_vm.getPropByPath(row,item.key))?_c('common-org-info',{attrs:{"org-id":_vm.getPropByPath(row,item.key),"type":"tag"}}):_c('span',[_vm._v("--")])]:_vm._e(),(item.type==='common')?[(_vm.getPropByPath(row,item.key))?_c("common-datas-info-id",{tag:"div",attrs:{"user-id":item.commonType['userId']?_vm.getPropByPath(row,item.key):'[]',"department-id":item.commonType['departmentId']?_vm.getPropByPath(row,item.key):'[]',"role-id":item.commonType['roleId']?_vm.getPropByPath(row,item.key):'[]',"base-data-id":item.commonType['baseDataId']?_vm.getPropByPath(row,item.key):'',"base-data-value":item.commonType['baseDataValue']?_vm.getPropByPath(row,item.key):'',"base-data-name":item.commonType['baseDataName']?_vm.getPropByPath(row,item.key):'',"base-data-info":true}}):_c('span',[_vm._v("--")])]:(item.type==='userId')?[(_vm.getPropByPath(row,item.key))?_c("common-datas-info-id",{tag:"div",attrs:{"user-id":JSON.stringify(_vm.getPropByPath(row,item.key)),"base-data-info":true}}):_c('span',[_vm._v("--")])]:(item.type==='time')?[(_vm.getPropByPath(row,item.key))?_c('span',[_vm._v(_vm._s(_vm.getPropByPath(row,item.key).replace('T', ' ').slice(0,19)))]):_c('span',[_vm._v("--")])]:_c('span',[_vm._v(_vm._s(_vm.getPropByPath(row,item.key)))])],{"row":row,"column":column,"rowIndex":rowIndex})]}},{key:"header",fn:function(ref){
 var column = ref.column;
 var $index = ref.$index;
-return [_vm._t('header_'+item.key,[_vm._v(_vm._s(item.title))],{"column":column,"$index":$index})]}}],null,true)}):_vm._e()]})],2)],1),(!_vm.hidePage)?_c('footer',[_c('el-row',[_c('el-col',{attrs:{"span":24}},[_c('PageInfo',{attrs:{"hide-on-single-page":_vm.pagination&&_vm.pagination.hideOnSinglePage,"small":_vm.pagination&&_vm.pagination.small,"page-sizes":_vm.pagination&&_vm.pagination.pageSizes,"page-info":_vm.state.pageInfo},on:{"onchange":function (e){ return _vm.$emit('onchange',e); }}})],1)],1)],1):_vm._e()])}
-var HtTablevue_type_template_id_28207e06_scoped_true_staticRenderFns = []
+return [_vm._t('header_'+item.key,[_vm._v(_vm._s(item.title))],{"column":column,"$index":$index})]}}],null,true)}):_vm._e()]})],2)],1),(!_vm.hidePage)?_c('footer',[_c('el-row',{attrs:{"name":"footer"}},[_vm._t("footerLeft"),_c('el-col',{attrs:{"span":12}},[_c('PageInfo',{attrs:{"hide-on-single-page":_vm.pagination&&_vm.pagination.hideOnSinglePage,"small":_vm.pagination&&_vm.pagination.small,"page-sizes":_vm.pagination&&_vm.pagination.pageSizes,"page-info":_vm.state.pageInfo},on:{"onchange":function (e){ return _vm.$emit('onchange',e); }}})],1)],2)],1):_vm._e()])}
+var HtTablevue_type_template_id_762ca12f_scoped_true_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/packages/HtTable/index.vue?vue&type=template&id=28207e06&scoped=true&
+// CONCATENATED MODULE: ./src/packages/HtTable/index.vue?vue&type=template&id=762ca12f&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__("5319");
@@ -9402,7 +9402,6 @@ var HtTablevue_type_script_lang_ts_HtTable = /*#__PURE__*/function (_Vue) {
   _createClass(HtTable, [{
     key: "created",
     value: function created() {
-      // console.log("this", this.$props);
       this.setPageInfo(this.pageInfo);
     }
   }, {
@@ -9487,6 +9486,8 @@ __decorate([Prop()], HtTablevue_type_script_lang_ts_HtTable.prototype, "columns"
 
 __decorate([Prop()], HtTablevue_type_script_lang_ts_HtTable.prototype, "data", void 0);
 
+__decorate([Prop()], HtTablevue_type_script_lang_ts_HtTable.prototype, "keyName", void 0);
+
 __decorate([Prop()], HtTablevue_type_script_lang_ts_HtTable.prototype, "hidePage", void 0);
 
 __decorate([Prop()], HtTablevue_type_script_lang_ts_HtTable.prototype, "checked", void 0);
@@ -9548,11 +9549,11 @@ HtTablevue_type_script_lang_ts_HtTable = __decorate([vue_class_component_esm({
 
 var HtTable_component = normalizeComponent(
   packages_HtTablevue_type_script_lang_ts_,
-  HtTablevue_type_template_id_28207e06_scoped_true_render,
-  HtTablevue_type_template_id_28207e06_scoped_true_staticRenderFns,
+  HtTablevue_type_template_id_762ca12f_scoped_true_render,
+  HtTablevue_type_template_id_762ca12f_scoped_true_staticRenderFns,
   false,
   null,
-  "28207e06",
+  "762ca12f",
   null
   
 )

package/lib/htui.umd.js

@@ -9344,25 +9344,25 @@ PageInfo.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_PageInfo = (PageInfo);
-// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"46e974bd-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/HtTable/index.vue?vue&type=template&id=28207e06&scoped=true&
-var HtTablevue_type_template_id_28207e06_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.state.loading),expression:"state.loading"}]},[_c('article',[_c('el-table',{ref:"comTable",attrs:{"height":_vm.height,"max-height":_vm.maxHeight,"border":_vm.border,"stripe":_vm.stripe,"size":_vm.size,"fit":_vm.fit,"show-header":_vm.showHeader,"empty-text":_vm.emptyText||'暂无数据',"row-style":_vm.rowStyle,"row-class-name":_vm.rowClassName,"current-row-key":_vm.currentRowKey,"highlight-current-row":_vm.highlightCurrentRow,"row-key":_vm.rowKey||'id',"data":_vm.data,"tooltip-effect":"dark"},on:{"row-click":function (row, column, event){ return _vm.$emit('row-click',row, column, event); },"row-contextmenu":function (row, column, event){ return _vm.$emit('row-contextmenu',row, column, event); },"row-dblclick":function (row, column, event){ return _vm.$emit('row-dblclick',row, column, event); },"header-click":function ( column, event){ return _vm.$emit('header-click', column, event); },"header-contextmenu":function ( column, event){ return _vm.$emit('header-contextmenu', column, event); },"sort-change":function (ref){
+// CONCATENATED MODULE: ./node_modules/cache-loader/dist/cjs.js?{"cacheDirectory":"node_modules/.cache/vue-loader","cacheIdentifier":"46e974bd-vue-loader-template"}!./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/cache-loader/dist/cjs.js??ref--0-0!./node_modules/vue-loader/lib??vue-loader-options!./src/packages/HtTable/index.vue?vue&type=template&id=762ca12f&scoped=true&
+var HtTablevue_type_template_id_762ca12f_scoped_true_render = function () {var _vm=this;var _h=_vm.$createElement;var _c=_vm._self._c||_h;return _c('div',{directives:[{name:"loading",rawName:"v-loading",value:(_vm.state.loading),expression:"state.loading"}]},[_c('article',[_c('el-table',{ref:"comTable",attrs:{"height":_vm.height,"max-height":_vm.maxHeight,"border":_vm.border,"stripe":_vm.stripe,"size":_vm.size,"fit":_vm.fit,"show-header":_vm.showHeader,"empty-text":_vm.emptyText||'暂无数据',"row-style":_vm.rowStyle,"row-class-name":_vm.rowClassName,"current-row-key":_vm.currentRowKey,"highlight-current-row":_vm.highlightCurrentRow,"row-key":_vm.rowKey||'id',"data":_vm.data,"tooltip-effect":"dark"},on:{"row-click":function (row, column, event){ return _vm.$emit('row-click',row, column, event); },"row-contextmenu":function (row, column, event){ return _vm.$emit('row-contextmenu',row, column, event); },"row-dblclick":function (row, column, event){ return _vm.$emit('row-dblclick',row, column, event); },"header-click":function ( column, event){ return _vm.$emit('header-click', column, event); },"header-contextmenu":function ( column, event){ return _vm.$emit('header-contextmenu', column, event); },"sort-change":function (ref){
 	var column = ref.column;
 	var prop = ref.prop;
 	var order = ref.order;
 
 	return _vm.$emit('sort-change', { column: column, prop: prop, order: order});
-},"filter-change":function (filter){ return _vm.$emit('filter-change', filter); },"current-change":function (currentRow, oldCurrentRow){ return _vm.$emit('current-change', currentRow, oldCurrentRow); },"select":function (selection, row){ return _vm.$emit('select',selection, row); },"select-all":function (selection){ return _vm.$emit('select-all',selection); },"selection-change":function (selection){ return _vm.$emit('selection-change',selection); },"cell-mouse-enter":function (row, column, cell, event){ return _vm.$emit('cell-mouse-enter',row, column, cell, event); },"cell-mouse-leave":function (row, column, cell, event){ return _vm.$emit('cell-mouse-leave',row, column, cell, event); },"cell-click":function (row, column, cell, event){ return _vm.$emit('cell-click',row, column, cell, event); },"cell-dblclick":function (row, column, cell, event){ return _vm.$emit('cell-dblclick',row, column, cell, event); }}},[(_vm.checked)?_c('el-table-column',{attrs:{"width":"55","reserve-selection":_vm.reserveSelection,"selectable":_vm.selectable,"type":"selection"}}):_vm._e(),(!_vm.hideOrder)?_c('el-table-column',{attrs:{"label":"序号","align":'center',"width":"55"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_vm._v(" "+_vm._s((_vm.state.pageInfo.currentPage-1)*_vm.state.pageInfo.pageSize+(scope.$index+1))+" ")]}}],null,false,2272936552)},[_c('template',{slot:"header"},[_vm._t('header_order')],2)],2):_vm._e(),_vm._l((_vm.columns),function(item){return [(!item.hide)?_c('el-table-column',{key:item.key,attrs:{"label":item.title,"fixed":item.fixed,"align":item.align,"header-align":item.headerAlign,"column-key":item.columnKey,"class-name":item.className,"show-overflow-tooltip":true,"prop":item.key,"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},scopedSlots:_vm._u([{key:"default",fn:function(ref){
+},"filter-change":function (filter){ return _vm.$emit('filter-change', filter); },"current-change":function (currentRow, oldCurrentRow){ return _vm.$emit('current-change', currentRow, oldCurrentRow); },"select":function (selection, row){ return _vm.$emit('select',selection, row); },"select-all":function (selection){ return _vm.$emit('select-all',selection); },"selection-change":function (selection){ return _vm.$emit('selection-change',selection); },"cell-mouse-enter":function (row, column, cell, event){ return _vm.$emit('cell-mouse-enter',row, column, cell, event); },"cell-mouse-leave":function (row, column, cell, event){ return _vm.$emit('cell-mouse-leave',row, column, cell, event); },"cell-click":function (row, column, cell, event){ return _vm.$emit('cell-click',row, column, cell, event); },"cell-dblclick":function (row, column, cell, event){ return _vm.$emit('cell-dblclick',row, column, cell, event); }}},[(_vm.checked)?_c('el-table-column',{attrs:{"width":"55","reserve-selection":_vm.reserveSelection,"selectable":_vm.selectable,"type":"selection"}}):_vm._e(),(!_vm.hideOrder)?_c('el-table-column',{attrs:{"label":_vm.keyName===undefined?'序号':_vm.keyName,"align":'center',"width":"55"},scopedSlots:_vm._u([{key:"default",fn:function(scope){return [_vm._v(" "+_vm._s((_vm.state.pageInfo.currentPage-1)*_vm.state.pageInfo.pageSize+(scope.$index+1))+" ")]}}],null,false,2272936552)},[_c('template',{slot:"header"},[_vm._t('header_order')],2)],2):_vm._e(),_vm._l((_vm.columns),function(item){return [(!item.hide)?_c('el-table-column',{key:item.key,attrs:{"label":item.title,"fixed":item.fixed,"align":item.align,"header-align":item.headerAlign,"column-key":item.columnKey,"class-name":item.className,"prop":item.key,"show-overflow-tooltip":item.type==='common'||item.type==='org'||item.type==='userId'?false:(item.showOverflowTooltip===false?false:true),"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},scopedSlots:_vm._u([{key:"default",fn:function(ref){
 var row = ref.row;
 var column = ref.column;
 var rowIndex = ref.rowIndex;
-return [_vm._t(item.key,[(item.type==='org')?[(_vm.getPropByPath(row,item.key))?_c('common-org-info',{attrs:{"org-id":_vm.getPropByPath(row,item.key),"type":"tag"}}):_c('span',[_vm._v("--")])]:(item.type==='userId')?[(_vm.getPropByPath(row,item.key))?_c("common-datas-info-id",{tag:"div",attrs:{"user-id":JSON.stringify(_vm.getPropByPath(row,item.key)),"base-data-info":true}}):_c('span',[_vm._v("--")])]:(item.type==='time')?[(_vm.getPropByPath(row,item.key))?_c('span',[_vm._v(_vm._s(_vm.getPropByPath(row,item.key).replace('T', ' ').slice(0,19)))]):_c('span',[_vm._v("--")])]:_c('span',[_vm._v(_vm._s(_vm.getPropByPath(row,item.key)))])],{"row":row,"column":column,"rowIndex":rowIndex})]}},{key:"header",fn:function(ref){
+return [_vm._t(item.key,[(item.type==='org')?[(_vm.getPropByPath(row,item.key))?_c('common-org-info',{attrs:{"org-id":_vm.getPropByPath(row,item.key),"type":"tag"}}):_c('span',[_vm._v("--")])]:_vm._e(),(item.type==='common')?[(_vm.getPropByPath(row,item.key))?_c("common-datas-info-id",{tag:"div",attrs:{"user-id":item.commonType['userId']?_vm.getPropByPath(row,item.key):'[]',"department-id":item.commonType['departmentId']?_vm.getPropByPath(row,item.key):'[]',"role-id":item.commonType['roleId']?_vm.getPropByPath(row,item.key):'[]',"base-data-id":item.commonType['baseDataId']?_vm.getPropByPath(row,item.key):'',"base-data-value":item.commonType['baseDataValue']?_vm.getPropByPath(row,item.key):'',"base-data-name":item.commonType['baseDataName']?_vm.getPropByPath(row,item.key):'',"base-data-info":true}}):_c('span',[_vm._v("--")])]:(item.type==='userId')?[(_vm.getPropByPath(row,item.key))?_c("common-datas-info-id",{tag:"div",attrs:{"user-id":JSON.stringify(_vm.getPropByPath(row,item.key)),"base-data-info":true}}):_c('span',[_vm._v("--")])]:(item.type==='time')?[(_vm.getPropByPath(row,item.key))?_c('span',[_vm._v(_vm._s(_vm.getPropByPath(row,item.key).replace('T', ' ').slice(0,19)))]):_c('span',[_vm._v("--")])]:_c('span',[_vm._v(_vm._s(_vm.getPropByPath(row,item.key)))])],{"row":row,"column":column,"rowIndex":rowIndex})]}},{key:"header",fn:function(ref){
 var column = ref.column;
 var $index = ref.$index;
-return [_vm._t('header_'+item.key,[_vm._v(_vm._s(item.title))],{"column":column,"$index":$index})]}}],null,true)}):_vm._e()]})],2)],1),(!_vm.hidePage)?_c('footer',[_c('el-row',[_c('el-col',{attrs:{"span":24}},[_c('PageInfo',{attrs:{"hide-on-single-page":_vm.pagination&&_vm.pagination.hideOnSinglePage,"small":_vm.pagination&&_vm.pagination.small,"page-sizes":_vm.pagination&&_vm.pagination.pageSizes,"page-info":_vm.state.pageInfo},on:{"onchange":function (e){ return _vm.$emit('onchange',e); }}})],1)],1)],1):_vm._e()])}
-var HtTablevue_type_template_id_28207e06_scoped_true_staticRenderFns = []
+return [_vm._t('header_'+item.key,[_vm._v(_vm._s(item.title))],{"column":column,"$index":$index})]}}],null,true)}):_vm._e()]})],2)],1),(!_vm.hidePage)?_c('footer',[_c('el-row',{attrs:{"name":"footer"}},[_vm._t("footerLeft"),_c('el-col',{attrs:{"span":12}},[_c('PageInfo',{attrs:{"hide-on-single-page":_vm.pagination&&_vm.pagination.hideOnSinglePage,"small":_vm.pagination&&_vm.pagination.small,"page-sizes":_vm.pagination&&_vm.pagination.pageSizes,"page-info":_vm.state.pageInfo},on:{"onchange":function (e){ return _vm.$emit('onchange',e); }}})],1)],2)],1):_vm._e()])}
+var HtTablevue_type_template_id_762ca12f_scoped_true_staticRenderFns = []
 
 
-// CONCATENATED MODULE: ./src/packages/HtTable/index.vue?vue&type=template&id=28207e06&scoped=true&
+// CONCATENATED MODULE: ./src/packages/HtTable/index.vue?vue&type=template&id=762ca12f&scoped=true&
 
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.string.replace.js
 var es_string_replace = __webpack_require__("5319");
@@ -9411,7 +9411,6 @@ var HtTablevue_type_script_lang_ts_HtTable = /*#__PURE__*/function (_Vue) {
   _createClass(HtTable, [{
     key: "created",
     value: function created() {
-      // console.log("this", this.$props);
       this.setPageInfo(this.pageInfo);
     }
   }, {
@@ -9496,6 +9495,8 @@ __decorate([Prop()], HtTablevue_type_script_lang_ts_HtTable.prototype, "columns"
 
 __decorate([Prop()], HtTablevue_type_script_lang_ts_HtTable.prototype, "data", void 0);
 
+__decorate([Prop()], HtTablevue_type_script_lang_ts_HtTable.prototype, "keyName", void 0);
+
 __decorate([Prop()], HtTablevue_type_script_lang_ts_HtTable.prototype, "hidePage", void 0);
 
 __decorate([Prop()], HtTablevue_type_script_lang_ts_HtTable.prototype, "checked", void 0);
@@ -9557,11 +9558,11 @@ HtTablevue_type_script_lang_ts_HtTable = __decorate([vue_class_component_esm({
 
 var HtTable_component = normalizeComponent(
   packages_HtTablevue_type_script_lang_ts_,
-  HtTablevue_type_template_id_28207e06_scoped_true_render,
-  HtTablevue_type_template_id_28207e06_scoped_true_staticRenderFns,
+  HtTablevue_type_template_id_762ca12f_scoped_true_render,
+  HtTablevue_type_template_id_762ca12f_scoped_true_staticRenderFns,
   false,
   null,
-  "28207e06",
+  "762ca12f",
   null
   
 )