eoss-ui 0.6.37 → 0.6.38

package/lib/selector-panel.js

@@ -3977,7 +3977,7 @@ module.exports = require("sortablejs");
 // 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/selector-panel/src/main.vue?vue&type=template&id=1990039f&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/main.vue?vue&type=template&id=0bd7f7ee&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4177,6 +4177,7 @@ var render = function () {
                       multiple: _vm.mix ? _vm.mix : _vm.multiple,
                       max: _vm.max,
                       showDisabled: _vm.showDisabled,
+                      disableds: _vm.disableds,
                     },
                     model: {
                       value: _vm.checkeds,
@@ -4244,7 +4245,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector-panel/src/main.vue?vue&type=template&id=1990039f&
+// CONCATENATED MODULE: ./packages/selector-panel/src/main.vue?vue&type=template&id=0bd7f7ee&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/tree.vue?vue&type=template&id=24ad732a&
 var treevue_type_template_id_24ad732a_render = function () {
@@ -4542,8 +4543,8 @@ var component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var tree = (component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/selection.vue?vue&type=template&id=a9db4d6e&
-var selectionvue_type_template_id_a9db4d6e_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector-panel/src/selection.vue?vue&type=template&id=2bc3d812&
+var selectionvue_type_template_id_2bc3d812_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -4596,8 +4597,7 @@ var selectionvue_type_template_id_a9db4d6e_render = function () {
                             _vm.isObject || typeof item == "string"
                               ? item
                               : item[_vm.valueKey],
-                          disabled:
-                            typeof item == "string" ? false : item.disabled,
+                          disabled: _vm.isDisabled(item),
                           "value-key": _vm.valueKey,
                           tooltip: item[_vm.tipKey],
                         },
@@ -4659,8 +4659,7 @@ var selectionvue_type_template_id_a9db4d6e_render = function () {
                             _vm.isObject || typeof item == "string"
                               ? item
                               : item[_vm.valueKey],
-                          disabled:
-                            typeof item == "string" ? false : item.disabled,
+                          disabled: _vm.isDisabled(item),
                           "value-key": _vm.valueKey,
                           tooltip: item[_vm.tipKey],
                         },
@@ -4700,11 +4699,11 @@ var selectionvue_type_template_id_a9db4d6e_render = function () {
     1
   )
 }
-var selectionvue_type_template_id_a9db4d6e_staticRenderFns = []
-selectionvue_type_template_id_a9db4d6e_render._withStripped = true
+var selectionvue_type_template_id_2bc3d812_staticRenderFns = []
+selectionvue_type_template_id_2bc3d812_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector-panel/src/selection.vue?vue&type=template&id=a9db4d6e&
+// CONCATENATED MODULE: ./packages/selector-panel/src/selection.vue?vue&type=template&id=2bc3d812&
 
 // EXTERNAL MODULE: external "sortablejs"
 var external_sortablejs_ = __webpack_require__(24);
@@ -4809,7 +4808,13 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       default: true
     },
     max: Number,
-    mix: Boolean
+    mix: Boolean,
+    disableds: {
+      type: Array,
+      default: function _default() {
+        return [];
+      }
+    }
   },
   data: function data() {
     return {};
@@ -4862,6 +4867,17 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
     },
     getprops: function getprops(attrs, res) {
       return util["a" /* default */].isObject(res) ? _extends({}, attrs, res) : attrs;
+    },
+    isDisabled: function 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: function beforeDestroy() {
@@ -4880,8 +4896,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var selection_component = Object(componentNormalizer["a" /* default */])(
   src_selectionvue_type_script_lang_js_,
-  selectionvue_type_template_id_a9db4d6e_render,
-  selectionvue_type_template_id_a9db4d6e_staticRenderFns,
+  selectionvue_type_template_id_2bc3d812_render,
+  selectionvue_type_template_id_2bc3d812_staticRenderFns,
   false,
   null,
   null,
@@ -5007,6 +5023,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
 //
 //
 //
+//
 
 
 
@@ -5106,7 +5123,13 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol
       default: true
     },
     max: Number,
-    mix: Boolean
+    mix: Boolean,
+    disableds: {
+      type: Array,
+      default: function _default() {
+        return [];
+      }
+    }
   },
   data: function data() {
     return {

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.37",
+  "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/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/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/upload/src/main.vue

@@ -541,7 +541,8 @@ export default {
       return true;
     },
     isSort() {
-      return this.dragSort && !this.isDisabled && this.isReadonly;
+      // return this.dragSort && !this.isDisabled && this.isReadonly;
+      return this.dragSort && !this.isDisabled;
     },
     datas() {
       if (this.data) {
@@ -1226,10 +1227,20 @@ export default {
               method: this.method,
               url: this.dochubConfig.sortDocumentsUrl || 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((res) => {

package/src/index.js

@@ -121,7 +121,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.6.37',
+  version: '0.6.38',
   install,
   Button,
   ButtonGroup,