eoss-ui 0.8.41 → 0.8.43

package/lib/selector.js

@@ -4689,7 +4689,7 @@ module.exports = require("json-bigint");
 // 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/src/main.vue?vue&type=template&id=18a2e4a6&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=060f91c3&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4700,16 +4700,29 @@ var render = function () {
         {
           ref: "esSelector",
           staticClass: "es-selector",
-          class: { "is-button": _vm.button && !_vm.readonly },
+          class: { "is-button": _vm.button && !_vm.isReadonly },
+          on: {
+            click: function ($event) {
+              $event.stopPropagation()
+              return _vm.handleClick($event)
+            },
+          },
         },
         [
           _vm.form
             ? [
-                _vm.button && !_vm.readonly
+                _vm.button && !_vm.isReadonly
                   ? _c(
                       "el-button",
                       _vm._b(
-                        { on: { click: _vm.openDialog } },
+                        {
+                          on: {
+                            click: function ($event) {
+                              $event.stopPropagation()
+                              return _vm.openDialog($event)
+                            },
+                          },
+                        },
                         "el-button",
                         _vm.button,
                         false
@@ -4724,13 +4737,13 @@ var render = function () {
                       2
                     )
                   : [
-                      !(_vm.multiple && _vm.readonly)
+                      !(_vm.multiple && _vm.isReadonly)
                         ? _c(
                             "el-autocomplete",
                             {
                               attrs: {
                                 "value-key": "showname",
-                                readonly: _vm.readonly,
+                                readonly: _vm.isReadonly || !this.isSearch,
                                 "fetch-suggestions": _vm.search,
                                 placeholder: _vm.placeholder,
                                 "trigger-on-focus": false,
@@ -4749,7 +4762,7 @@ var render = function () {
                               },
                             },
                             [
-                              !_vm.readonly
+                              !_vm.isReadonly
                                 ? _c("el-button", {
                                     staticClass: "es-selector-btn",
                                     attrs: {
@@ -4777,7 +4790,7 @@ var render = function () {
                               ref: "tags",
                               staticClass: "es-select__tags",
                               class: {
-                                "is-edit": !_vm.readonly,
+                                "is-edit": !_vm.isReadonly,
                                 "is-show": _vm.selected.length,
                               },
                             },
@@ -4789,7 +4802,7 @@ var render = function () {
                                   attrs: {
                                     closable:
                                       !_vm.selectorDisabled &&
-                                      !_vm.readonly &&
+                                      !_vm.isReadonly &&
                                       _vm.selected.length > _vm.min,
                                     type: "info",
                                     "disable-transitions": "",
@@ -4815,7 +4828,7 @@ var render = function () {
                     ],
               ]
             : _vm._e(),
-          !_vm.readonly
+          !_vm.isReadonly
             ? _c(
                 "es-dialog",
                 {
@@ -4890,7 +4903,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=18a2e4a6&
+// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=060f91c3&
 
 // EXTERNAL MODULE: ./src/utils/util.js + 1 modules
 var util = __webpack_require__(0);
@@ -4996,6 +5009,13 @@ var external_throttle_debounce_ = __webpack_require__(13);
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -5145,7 +5165,10 @@ var external_throttle_debounce_ = __webpack_require__(13);
       default: true
     },
     //弹窗关闭时是否销毁子组件
-    destroyOnClose: Boolean,
+    destroyOnClose: {
+      type: Boolean,
+      default: true
+    },
     //树结构标题
     treeTitle: String,
     //是否显示切换按钮
@@ -5153,7 +5176,12 @@ var external_throttle_debounce_ = __webpack_require__(13);
       type: Boolean,
       default: true
     },
-    selection: [Array, String]
+    selection: [Array, String],
+    //输入框是否可搜索
+    isSearch: {
+      type: Boolean,
+      default: true
+    }
   },
   data: function data() {
     return {
@@ -5173,6 +5201,9 @@ var external_throttle_debounce_ = __webpack_require__(13);
   },
 
   computed: {
+    isReadonly: function isReadonly() {
+      return this.readonly || (this.elForm || {}).readonly;
+    },
     isRender: function isRender() {
       var useCaseCodes = util["a" /* default */].getStorage('useCaseCodes');
       if (useCaseCodes && this.useCaseCode) {
@@ -5260,11 +5291,6 @@ var external_throttle_debounce_ = __webpack_require__(13);
         _this2.$refs.reference && (_this2.minWidth = _this2.$refs.reference.$el.children[0].offsetWidth);
       });
     }
-    if (this.$refs.openDialog) {
-      this.$refs.openDialog.$el.parentNode.addEventListener('click', function () {
-        _this2.openDialog();
-      });
-    }
   },
 
   methods: {
@@ -5295,8 +5321,14 @@ var external_throttle_debounce_ = __webpack_require__(13);
     getValueKey: function getValueKey(obj) {
       return util["a" /* default */].isObject(obj) ? obj[this.valueKey] : obj;
     },
+    handleClick: function handleClick() {
+      console.log('handleClick');
+      if (!this.isSearch) {
+        this.openDialog();
+      }
+    },
     openDialog: function openDialog() {
-      if (!this.selectorDisabled && !this.readonly && this.select) {
+      if (!this.selectorDisabled && !this.isReadonly && this.select) {
         this.visible = true;
       }
     },
@@ -5462,7 +5494,7 @@ var external_throttle_debounce_ = __webpack_require__(13);
           }
         }
         if (height) {
-          if (_this4.readonly) {
+          if (_this4.isReadonly) {
             _this4.$refs.reference.style.height = height;
           } else {
             var inputChildNodes = _this4.$refs.reference.$el.childNodes;

package/lib/upload.js

@@ -4750,8 +4750,8 @@ module.exports = require("spark-md5");
 // 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=2e5de86a&
-var mainvue_type_template_id_2e5de86a_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=7388a79d&
+var mainvue_type_template_id_7388a79d_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5135,10 +5135,10 @@ var mainvue_type_template_id_2e5de86a_render = function () {
     : _vm._e()
 }
 var staticRenderFns = []
-mainvue_type_template_id_2e5de86a_render._withStripped = true
+mainvue_type_template_id_7388a79d_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=2e5de86a&
+// CONCATENATED MODULE: ./packages/upload/src/main.vue?vue&type=template&id=7388a79d&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -6324,6 +6324,7 @@ var _props;
     handleSort: function handleSort(files) {
       var _this10 = this;
 
+      console.log('files', files);
       if (this.isSort) {
         if (this.onSort) {
           this.onSort(files);
@@ -6417,7 +6418,18 @@ var _props;
       this.onRemove && this.onRemove(file, fileList);
     },
     handleError: function handleError(err, file, fileList) {
-      var errorMsg = err.response && err.response.data && err.response.data.msg;
+      console.log('err', err);
+      console.log('type', typeof err === 'undefined' ? 'undefined' : _typeof(err));
+      var errorMsg = '';
+      try {
+        var raw = err.message || '';
+        var jsonStr = raw.replace(/^Error:\s*/, '');
+        var parsed = JSON.parse(jsonStr);
+        errorMsg = parsed.msg || parsed.message || '';
+      } catch (e) {
+        errorMsg = err.message || err.msg || '上传失败：请联系管理员';
+      }
+      errorMsg = errorMsg || err.msg || err.message || '上传失败：请联系管理员';
       if (this.showMessage.error) {
         if (this.dangerouslyUseHTMLString) {
           this.$alert(errorMsg ? errorMsg : err.msg ? err.msg : '上传失败：请联系管理员', '提示', {
@@ -6770,7 +6782,7 @@ var componentNormalizer = __webpack_require__(3);
 
 var component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_2e5de86a_render,
+  mainvue_type_template_id_7388a79d_render,
   staticRenderFns,
   false,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.8.41",
+  "version": "0.8.43",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [
@@ -55,7 +55,7 @@
   "dependencies": {
     "@interactjs/feedback": "^1.10.3",
     "axios": "^0.27.2",
-    "eoss-element": "^0.3.77",
+    "eoss-element": "^0.3.79",
     "interactjs": "^1.10.26",
     "js-base64": "^3.7.5",
     "json-bigint": "^1.0.0",

package/packages/flow/src/main.vue

@@ -1187,6 +1187,7 @@
           :opinion="value"
           :businessName="businessName"
           :type="taskReadType"
+          :resetAppId="resetAppId"
           :showTooltip="showTooltip"
           :flowLabelConfig="flowLabelConfig"
           :hideMessage="hideMessage"

package/packages/selector/src/main.vue

@@ -1,12 +1,17 @@
 <template>
   <div
+    @click.stop="handleClick"
     v-if="isRender"
     class="es-selector"
     ref="esSelector"
-    :class="{ 'is-button': button && !readonly }"
+    :class="{ 'is-button': button && !isReadonly }"
   >
     <template v-if="form">
-      <el-button v-if="button && !readonly" v-bind="button" @click="openDialog">
+      <el-button
+        v-if="button && !isReadonly"
+        v-bind="button"
+        @click.stop="openDialog"
+      >
         <slot>
           <es-icon v-if="icon" :contents="icon"></es-icon>
           <template v-else>选择</template>
@@ -14,10 +19,10 @@
       </el-button>
       <template v-else>
         <el-autocomplete
-          v-if="!(multiple && readonly)"
+          v-if="!(multiple && isReadonly)"
           v-model="selectedLabel"
           value-key="showname"
-          :readonly="readonly"
+          :readonly="isReadonly || !this.isSearch"
           :fetch-suggestions="search"
           :placeholder="placeholder"
           :trigger-on-focus="false"
@@ -26,7 +31,7 @@
           @change="handleChange"
         >
           <el-button
-            v-if="!readonly"
+            v-if="!isReadonly"
             slot="suffix"
             type="text"
             class="es-selector-btn"
@@ -38,12 +43,14 @@
           v-if="multiple"
           ref="tags"
           class="es-select__tags"
-          :class="{ 'is-edit': !readonly, 'is-show': selected.length }"
+          :class="{ 'is-edit': !isReadonly, 'is-show': selected.length }"
         >
           <el-tag
             v-for="(item, index) in selected"
             :key="getValueKey(item)"
-            :closable="!selectorDisabled && !readonly && selected.length > min"
+            :closable="
+              !selectorDisabled && !isReadonly && selected.length > min
+            "
             type="info"
             disable-transitions
             @close="deleteTag($event, item, index)"
@@ -54,7 +61,7 @@
       </template>
     </template>
     <es-dialog
-      v-if="!readonly"
+      v-if="!isReadonly"
       :title="title"
       :visible.sync="visible"
       :width="width"
@@ -237,7 +244,10 @@ export default {
       default: true
     },
     //弹窗关闭时是否销毁子组件
-    destroyOnClose: Boolean,
+    destroyOnClose: {
+      type: Boolean,
+      default: true
+    },
     //树结构标题
     treeTitle: String,
     //是否显示切换按钮
@@ -245,7 +255,12 @@ export default {
       type: Boolean,
       default: true
     },
-    selection: [Array, String]
+    selection: [Array, String],
+    //输入框是否可搜索
+    isSearch: {
+      type: Boolean,
+      default: true
+    }
   },
   data() {
     return {
@@ -264,6 +279,9 @@ export default {
     };
   },
   computed: {
+    isReadonly() {
+      return this.readonly || (this.elForm || {}).readonly;
+    },
     isRender() {
       let useCaseCodes = util.getStorage('useCaseCodes');
       if (useCaseCodes && this.useCaseCode) {
@@ -352,11 +370,6 @@ export default {
           (this.minWidth = this.$refs.reference.$el.children[0].offsetWidth);
       });
     }
-    if (this.$refs.openDialog) {
-      this.$refs.openDialog.$el.parentNode.addEventListener('click', () => {
-        this.openDialog();
-      });
-    }
   },
   methods: {
     getSysParam() {
@@ -388,8 +401,14 @@ export default {
     getValueKey(obj) {
       return util.isObject(obj) ? obj[this.valueKey] : obj;
     },
+    handleClick() {
+      console.log('handleClick');
+      if (!this.isSearch) {
+        this.openDialog();
+      }
+    },
     openDialog() {
-      if (!this.selectorDisabled && !this.readonly && this.select) {
+      if (!this.selectorDisabled && !this.isReadonly && this.select) {
         this.visible = true;
       }
     },
@@ -573,7 +592,7 @@ export default {
           }
         }
         if (height) {
-          if (this.readonly) {
+          if (this.isReadonly) {
             this.$refs.reference.style.height = height;
           } else {
             let inputChildNodes = this.$refs.reference.$el.childNodes;

package/packages/upload/src/main.vue

@@ -1353,6 +1353,7 @@ export default {
       a.dispatchEvent(event);
     },
     handleSort(files) {
+      console.log('files', files);
       if (this.isSort) {
         if (this.onSort) {
           this.onSort(files);
@@ -1461,7 +1462,18 @@ export default {
       this.onRemove && this.onRemove(file, fileList);
     },
     handleError(err, file, fileList) {
-      let errorMsg = err.response && err.response.data && err.response.data.msg;
+      console.log('err', err);
+      console.log('type', typeof err);
+      let errorMsg = '';
+      try {
+        const raw = err.message || '';
+        const jsonStr = raw.replace(/^Error:\s*/, '');
+        const parsed = JSON.parse(jsonStr);
+        errorMsg = parsed.msg || parsed.message || '';
+      } catch (e) {
+        errorMsg = err.message || err.msg || '上传失败：请联系管理员';
+      }
+      errorMsg = errorMsg || err.msg || err.message || '上传失败：请联系管理员';
       if (this.showMessage.error) {
         if (this.dangerouslyUseHTMLString) {
           this.$alert(

package/src/index.js

@@ -127,7 +127,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.8.41',
+  version: '0.8.43',
   install,
   Archives,
   Button,