eoss-ui 0.6.35 → 0.6.37

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.35",
+  "version": "0.6.37",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -98,7 +98,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.3.31",
+    "eoss-element": "^0.3.33",
     "es6-promise": "^4.0.5",
     "eslint": "4.18.2",
     "eslint-config-elemefe": "0.1.1",

package/packages/data-table/src/main.vue

@@ -107,6 +107,7 @@
             </template>
             <template v-else>
               <children
+                :key="item.key || item.label || item.title || index"
                 :tag="item.tag"
                 v-bind="{
                   mode: mode,
@@ -116,7 +117,6 @@
                   readonly: readonly,
                   optionData: optionDatas,
                   dragSort: dragSort,
-                  key: item.key || item.label || item.title || index,
                   ...(dragSort ? { ...item, fixed: false } : { ...item })
                 }"
                 v-on="{

package/packages/select/src/main.vue

@@ -290,7 +290,20 @@ export default {
                   })
                 );
               } else {
-                let content = [item[this.label] || item.label];
+                let content = [];
+                const labelContent = item[this.label] || item.label;
+                //判断它是否是html字符串
+                if (
+                  typeof labelContent === 'string' &&
+                  /<[^>]+>/.test(labelContent)
+                ) {
+                  // 如果是 HTML 字符串，创建对应的 VNode
+                  content = [
+                    h('div', { domProps: { innerHTML: labelContent } })
+                  ];
+                } else {
+                  content = [labelContent];
+                }
                 if (item.render) {
                   content = [item.render(h, item)];
                 }
@@ -305,6 +318,7 @@ export default {
                     })
                   );
                 }
+
                 eles.push(
                   h(
                     'el-option',

package/packages/theme-chalk/lib/data-table.css

@@ -1 +1 @@
-@charset "UTF-8";.es-data-table,.es-data-table-content .es-table .el-table__body-wrapper .el-table__body{position:relative}.es-data-table .es-toolbar.es-table-toolbar-plus{padding:16px 16px 8px;border-color:transparent}.es-data-table .es-toolbar.es-table-toolbar-plus .es-advanced-filter.es-absolute{top:55px}.es-data-table .es-toolbar.es-table-toolbar-plus .es-advanced-filter.es-absolute .es-form{border:0}.es-data-table .es-toolbar+.es-data-table-content{padding:16px}.es-data-table .es-toolbar+.es-data-table-content.es-table-plus{padding-top:0}.es-data-table-content{background-color:#fafafa}.es-data-table-content .es-table:not(.el-table--border){border:1px solid #e1e1e1;border-bottom:0}.es-data-table-content .es-table thead th,.es-data-table-content .es-table thead tr{background-color:#f8f8f8;border-color:#e1e1e1}.es-data-table-content .es-table th,.es-data-table-content .es-table thead tr{padding:6px 0;text-align:center}.es-data-table-content .es-table th .cell,.es-data-table-content .es-table thead tr .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td{padding:6px 0}.es-data-table-content .es-table td.es-table-handle-box .cell,.es-data-table-content .es-table td.is-center .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td.is-right .cell{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-data-table-content .es-table .es-table-handle-box{text-align:center}.es-data-table-content .es-table+.es-table-page{margin-top:-1px}.es-data-table-content .es-table .el-table__fixed-right::before,.es-data-table-content .es-table .el-table__fixed::before{background-color:transparent}.es-data-table-content .es-table .cell{min-height:28px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:center;align-content:center}.es-data-table-content .es-table .cell:not(.el-tooltip){display:-webkit-box;display:-ms-flexbox;display:flex}.es-data-table-content .es-table .cell.el-tooltip{line-height:22px}.es-data-table-content .es-table .el-form-item{margin-bottom:0;width:100%}.es-data-table-content .es-table .el-form-item .el-input:not(.el-input--prefix) .el-input__inner{padding:0 8px;margin-top:0}.es-data-table-content .es-table .el-form-item .el-input-number,.es-data-table-content .es-table .el-form-item .el-select{width:100%}.es-data-table-content .es-table.el-scrollbar>.el-scrollbar__bar{z-index:8}.es-data-table-content.es-table-border-none .es-table{border:0}.es-data-table-content.es-table-border-none .es-table::before{content:none}.es-data-table-content.es-table-border-none .es-table td,.es-data-table-content.es-table-border-none .es-table th{border:0}.es-data-table-content.es-table-border-none .es-table-page{border:0;margin-top:0;background-color:#fff}.es-data-table-content .el-table__header,.es-data-table-content .el-table__header thead{color:#404040}.es-data-table-content .el-table__body tr.hover-row.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped>td,.es-data-table-content .el-table__body tr.hover-row>td,.es-data-table-content .el-table__body tr:hover>td{background-color:#e6f7ff}.es-data-table-content .el-table__body tr.current-row>td{background-color:#91d5ff}.es-data-table-content .es-table-page{height:46px;border:1px solid #e1e1e1;padding:8px 24px;background-color:#f8f8f8}.es-data-table-content .es-table-page.es-loading-page{line-height:30px;font-size:14px;font-weight:400;color:rgba(0,0,0,.75)}.es-data-table-content.es-table-plus .el-table__header thead,.es-data-table-content.es-table-plus .es-table-page .el-pagination__total,.es-data-table-content.es-table-plus .es-table-page .el-select__caret{color:#6e7c98}.es-data-table-content .es-thead-border .el-table__header th:not(.gutter){border-right:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__header thead:not(.is-group) th:last-child{border-right:0;border-bottom:1px solid #e1e1e1}.es-data-table-content .es-thead-border .is-scrolling-right~.el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:0}.es-data-table-content .el-form-item__error{top:unset;bottom:0}.es-data-table-content .es-table:not(.el-table--border) .el-table--border td,.es-data-table-content .es-table:not(.el-table--border) .el-table--border th,.es-data-table-content .es-table:not(.el-table--border) .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{border-right:0}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td{border-right:1px solid #e1e1e1}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td:last-child{border-right:0}.es-data-table-content.es-table-plus{background-color:#fff;padding-top:0}.es-data-table-content.es-table-plus .el-table__header th{background-color:#fff;border-color:#cdd9e4}.es-data-table-content.es-table-plus .el-table__header th:not(.gutter){border-right-color:transparent}.es-data-table-content.es-table-plus .es-table{border-color:transparent}.es-data-table-content.es-table-plus .es-table::before{background-color:#cdd9e4}.es-data-table-content.es-table-plus .es-table td{border-color:#cdd9e4}.es-data-table-content.es-table-plus .es-table .cell{min-height:35px}.es-data-table-content.es-table-plus .es-table-page{height:48px;padding:10px 24px;background-color:#fff;border-color:#cdd9e4 transparent transparent}.el-table--border::after,.el-table--group::after,.el-table::before{z-index:5}.es-table-sizer{height:100%}.sizer-btn-box{text-align:right;margin-top:7px}.es-table-sizer-tips{color:red;line-height:20px}.es-table-setting{font-size:16px;cursor:pointer;position:absolute;right:0;top:0;z-index:99}
+@charset "UTF-8";.es-data-table,.es-data-table-content .es-table .el-table__body-wrapper .el-table__body{position:relative}.es-data-table .es-toolbar.es-table-toolbar-plus{padding:16px 16px 8px;border-color:transparent}.es-data-table .es-toolbar.es-table-toolbar-plus .es-advanced-filter.es-absolute{top:55px}.es-data-table .es-toolbar.es-table-toolbar-plus .es-advanced-filter.es-absolute .es-form{border:0}.es-data-table .es-toolbar+.es-data-table-content{padding:16px}.es-data-table .es-toolbar+.es-data-table-content.es-table-plus{padding-top:0}.es-data-table-content{background-color:#fafafa}.es-data-table-content .es-table:not(.el-table--border){border:1px solid #e1e1e1;border-bottom:0}.es-data-table-content .es-table thead th,.es-data-table-content .es-table thead tr{background-color:#f8f8f8;border-color:#e1e1e1}.es-data-table-content .es-table th,.es-data-table-content .es-table thead tr{padding:6px 0;text-align:center}.es-data-table-content .es-table th.is-right,.es-data-table-content .es-table thead tr.is-right{text-align:right}.es-data-table-content .es-table th.is-right .cell,.es-data-table-content .es-table thead tr.is-right .cell{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-data-table-content .es-table th.is-left,.es-data-table-content .es-table thead tr.is-left{text-align:left}.es-data-table-content .es-table th.is-left .cell,.es-data-table-content .es-table thead tr.is-left .cell{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.es-data-table-content .es-table th .cell,.es-data-table-content .es-table thead tr .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td{padding:6px 0}.es-data-table-content .es-table td.es-table-handle-box .cell,.es-data-table-content .es-table td.is-center .cell{-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.es-data-table-content .es-table td.is-right .cell{-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end}.es-data-table-content .es-table td.is-left .cell{-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.es-data-table-content .es-table .es-table-handle-box{text-align:center}.es-data-table-content .es-table+.es-table-page{margin-top:-1px}.es-data-table-content .es-table .el-table__fixed-right::before,.es-data-table-content .es-table .el-table__fixed::before{background-color:transparent}.es-data-table-content .es-table .cell{min-height:28px;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-ms-flex-line-pack:center;align-content:center}.es-data-table-content .es-table .cell:not(.el-tooltip){display:-webkit-box;display:-ms-flexbox;display:flex}.es-data-table-content .es-table .cell.el-tooltip{line-height:22px}.es-data-table-content .es-table .el-form-item{margin-bottom:0;width:100%}.es-data-table-content .es-table .el-form-item .el-input:not(.el-input--prefix) .el-input__inner{padding:0 8px;margin-top:0}.es-data-table-content .es-table .el-form-item .el-input-number,.es-data-table-content .es-table .el-form-item .el-select{width:100%}.es-data-table-content .es-table.el-scrollbar>.el-scrollbar__bar{z-index:8}.es-data-table-content.es-table-border-none .es-table{border:0}.es-data-table-content.es-table-border-none .es-table::before{content:none}.es-data-table-content.es-table-border-none .es-table td,.es-data-table-content.es-table-border-none .es-table th{border:0}.es-data-table-content.es-table-border-none .es-table-page{border:0;margin-top:0;background-color:#fff}.es-data-table-content .el-table__header,.es-data-table-content .el-table__header thead{color:#404040}.es-data-table-content .el-table__body tr.hover-row.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped.current-row>td,.es-data-table-content .el-table__body tr.hover-row.el-table__row--striped>td,.es-data-table-content .el-table__body tr.hover-row>td,.es-data-table-content .el-table__body tr:hover>td{background-color:#e6f7ff}.es-data-table-content .el-table__body tr.current-row>td{background-color:#91d5ff}.es-data-table-content .es-table-page{height:46px;border:1px solid #e1e1e1;padding:8px 24px;background-color:#f8f8f8}.es-data-table-content .es-table-page.es-loading-page{line-height:30px;font-size:14px;font-weight:400;color:rgba(0,0,0,.75)}.es-data-table-content.es-table-plus .el-table__header thead,.es-data-table-content.es-table-plus .es-table-page .el-pagination__total,.es-data-table-content.es-table-plus .es-table-page .el-select__caret{color:#6e7c98}.es-data-table-content .es-thead-border .el-table__header th:not(.gutter){border-right:1px solid #e1e1e1}.es-data-table-content .es-thead-border .el-table__header thead:not(.is-group) th:last-child{border-right:0;border-bottom:1px solid #e1e1e1}.es-data-table-content .es-thead-border .is-scrolling-right~.el-table__fixed-right:not(.el-table-box-shadow) thead th:last-child{border-left:0}.es-data-table-content .el-form-item__error{top:unset;bottom:0}.es-data-table-content .es-table:not(.el-table--border) .el-table--border td,.es-data-table-content .es-table:not(.el-table--border) .el-table--border th,.es-data-table-content .es-table:not(.el-table--border) .el-table__body-wrapper .el-table--border.is-scrolling-left~.el-table__fixed{border-right:0}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td{border-right:1px solid #e1e1e1}.es-data-table-content .is-scrolling-right+.el-table__fixed-body-wrapper td:last-child{border-right:0}.es-data-table-content.es-table-plus{background-color:#fff;padding-top:0}.es-data-table-content.es-table-plus .el-table__header th{background-color:#fff;border-color:#cdd9e4}.es-data-table-content.es-table-plus .el-table__header th:not(.gutter){border-right-color:transparent}.es-data-table-content.es-table-plus .es-table{border-color:transparent}.es-data-table-content.es-table-plus .es-table::before{background-color:#cdd9e4}.es-data-table-content.es-table-plus .es-table td{border-color:#cdd9e4}.es-data-table-content.es-table-plus .es-table .cell{min-height:35px}.es-data-table-content.es-table-plus .es-table-page{height:48px;padding:10px 24px;background-color:#fff;border-color:#cdd9e4 transparent transparent}.el-table--border::after,.el-table--group::after,.el-table::before{z-index:5}.es-table-sizer{height:100%}.sizer-btn-box{text-align:right;margin-top:7px}.es-table-sizer-tips{color:red;line-height:20px}.es-table-setting{font-size:16px;cursor:pointer;position:absolute;right:0;top:0;z-index:99}