eoss-ui 0.6.36 → 0.6.38

package/lib/upload.js

@@ -4006,8 +4006,8 @@ module.exports = require("js-base64");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=1d0cf2a3&
-var mainvue_type_template_id_1d0cf2a3_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/upload/src/main.vue?vue&type=template&id=8de518f6&
+var mainvue_type_template_id_8de518f6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4388,10 +4388,10 @@ var mainvue_type_template_id_1d0cf2a3_render = function () {
     : _vm._e()
 }
 var staticRenderFns = []
-mainvue_type_template_id_1d0cf2a3_render._withStripped = true
+mainvue_type_template_id_8de518f6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=1d0cf2a3&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=8de518f6&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -4932,7 +4932,8 @@ var _props;
       return true;
     },
     isSort: function isSort() {
-      return this.dragSort && !this.isDisabled && this.isReadonly;
+      // return this.dragSort && !this.isDisabled && this.isReadonly;
+      return this.dragSort && !this.isDisabled;
     },
     datas: function datas() {
       if (this.data) {
@@ -5453,10 +5454,20 @@ var _props;
             method: this.method,
             url: this.dochubConfig.sortDocumentsUrl || api["cc" /* uploadSort */],
             data: {
-              ids: ids
+              ids: ids,
+              documentIds: ids,
+              ownId: this.ownId,
+              code: this.code,
+              bucketCode: this.code,
+              businessId: this.ownId
             },
             params: {
-              ids: ids
+              ids: ids,
+              documentIds: ids,
+              ownId: this.ownId,
+              code: this.code,
+              bucketCode: this.code,
+              businessId: this.ownId
             }
           }).then(function (res) {
             if (res.rCode === 0) {
@@ -5553,7 +5564,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_1d0cf2a3_render,
+  mainvue_type_template_id_8de518f6_render,
   staticRenderFns,
   false,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.36",
+  "version": "0.6.38",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -70,7 +70,7 @@
     "stompjs": "^2.3.3",
     "throttle-debounce": "^5.0.2",
     "video.js": "^8.0.4",
-    "wujie-vue2": "^1.0.26"
+    "wujie-vue2": "^1.0.28"
   },
   "peerDependencies": {
     "vue": "^2.5.22"
@@ -98,7 +98,7 @@
     "cp-cli": "^1.0.2",
     "cross-env": "^3.1.3",
     "css-loader": "^2.1.0",
-    "eoss-element": "^0.3.33",
+    "eoss-element": "^0.3.35",
     "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/form/src/main.vue

@@ -504,6 +504,7 @@
                           v-model="models[item.name]"
                           btn-size="medium"
                           :readonly="readonly ? readonly : item.readonly"
+                          :fileCount.sync="fileCount"
                           :rules="item.rules"
                           v-on="
                             handleExclAttribute({
@@ -2393,7 +2394,8 @@ export default {
       uuid: util.uuid(32),
       dialog: false,
       refresh: true,
-      ready: false
+      ready: false,
+      fileCount: 0
     };
   },
   computed: {

package/packages/select/src/main.vue

@@ -202,7 +202,6 @@ export default {
           this.label = this.service ? 'label' : 'shortName';
           this.valKey = this.service ? 'value' : 'cciValue';
           const options = store.get(val);
-          debugger;
           if (options) {
             this.options = JSON.parse(JSON.stringify(options));
           } else {

package/packages/selector-panel/src/main.vue

@@ -82,6 +82,7 @@
             :multiple="mix ? mix : multiple"
             :max="max"
             :showDisabled="showDisabled"
+            :disableds="disableds"
           ></selection>
           <selection
             v-model="checkeds"
@@ -211,7 +212,13 @@ export default {
       default: true
     },
     max: Number,
-    mix: Boolean
+    mix: Boolean,
+    disableds: {
+      type: Array,
+      default() {
+        return [];
+      }
+    }
   },
   data() {
     return {

package/packages/selector-panel/src/selection.vue

@@ -14,7 +14,7 @@
           v-show="item.disabled ? showDisabled : true"
           v-bind="getprops($attrs, item)"
           :label="isObject || typeof item == 'string' ? item : item[valueKey]"
-          :disabled="typeof item == 'string' ? false : item.disabled"
+          :disabled="isDisabled(item)"
           :class="{ 'es-radio-delete': genre === 'delete' }"
           :value-key="valueKey"
           :tooltip="item[tipKey]"
@@ -37,7 +37,7 @@
           v-show="item.disabled ? showDisabled : true"
           v-bind="getprops($attrs, item)"
           :label="isObject || typeof item == 'string' ? item : item[valueKey]"
-          :disabled="typeof item == 'string' ? false : item.disabled"
+          :disabled="isDisabled(item)"
           :class="{ 'es-checkbox-delete': genre === 'delete' }"
           :value-key="valueKey"
           :tooltip="item[tipKey]"
@@ -91,7 +91,13 @@ export default {
       default: true
     },
     max: Number,
-    mix: Boolean
+    mix: Boolean,
+    disableds: {
+      type: Array,
+      default() {
+        return [];
+      }
+    }
   },
   data() {
     return {};
@@ -151,6 +157,17 @@ export default {
     },
     getprops(attrs, res) {
       return util.isObject(res) ? { ...attrs, ...res } : attrs;
+    },
+    isDisabled(res) {
+      if (typeof res == 'string') {
+        return false;
+      }
+      if (this.disableds && this.disableds.length > 0) {
+        if (this.disableds.includes(res[this.valueKey])) {
+          return true;
+        }
+      }
+      return res.disabled;
     }
   },
   beforeDestroy() {

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}