eoss-ui 0.6.70 → 0.6.71

package/lib/main.js

@@ -9575,8 +9575,8 @@ var online_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var online = (online_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/public/search.vue?vue&type=template&id=2928af7a&
-var searchvue_type_template_id_2928af7a_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/public/search.vue?vue&type=template&id=46cd8f32&
+var searchvue_type_template_id_46cd8f32_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -9969,7 +9969,7 @@ var searchvue_type_template_id_2928af7a_render = function () {
       _c(
         "es-dialog",
         {
-          attrs: { title: _vm.title, visible: _vm.visible, size: "lg" },
+          attrs: { title: _vm.title, visible: _vm.visible, size: "max" },
           on: {
             "update:visible": function ($event) {
               _vm.visible = $event
@@ -9991,11 +9991,11 @@ var searchvue_type_template_id_2928af7a_render = function () {
     1
   )
 }
-var searchvue_type_template_id_2928af7a_staticRenderFns = []
-searchvue_type_template_id_2928af7a_render._withStripped = true
+var searchvue_type_template_id_46cd8f32_staticRenderFns = []
+searchvue_type_template_id_46cd8f32_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/public/search.vue?vue&type=template&id=2928af7a&
+// CONCATENATED MODULE: ./packages/main/src/public/search.vue?vue&type=template&id=46cd8f32&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/public/search.vue?vue&type=script&lang=js&
 var searchvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
@@ -10320,16 +10320,16 @@ var searchvue_type_script_lang_js_extends = Object.assign || function (target) {
             this.isLoading = false;
             this.types[i].records = this.searchData(this.menus, keyWords);
             this.types[i].totalCount = this.types[i].records.length;
-            this.types[i].pageCount = Math.ceil(this.types[i].records.length / this.pageSize);
-            this.types[i].pageNum = 0;
+            this.types[i].pageCount = 1;
+            this.types[i].pageNum = 1;
             this.$set(this.loadings, item.id || String(i), false);
             this.$set(this.noMore, item.id || String(i), true);
           } else if (item.name == '应用' && this.apps.length) {
             this.isLoading = false;
             this.types[i].records = this.searchData(this.apps, keyWords);
             this.types[i].totalCount = this.types[i].records.length;
-            this.types[i].pageCount = Math.ceil(this.types[i].records.length / this.pageSize);
-            this.types[i].pageNum = 0;
+            this.types[i].pageCount = 1;
+            this.types[i].pageNum = 1;
             this.$set(this.loadings, item.id || String(i), false);
             this.$set(this.noMore, item.id || String(i), true);
           } else if (item.dataRequestUrl) {
@@ -10458,8 +10458,8 @@ var searchvue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var search_component = Object(componentNormalizer["a" /* default */])(
   public_searchvue_type_script_lang_js_,
-  searchvue_type_template_id_2928af7a_render,
-  searchvue_type_template_id_2928af7a_staticRenderFns,
+  searchvue_type_template_id_46cd8f32_render,
+  searchvue_type_template_id_46cd8f32_staticRenderFns,
   false,
   null,
   null,

package/lib/selector.js

@@ -4119,7 +4119,7 @@ module.exports = require("axios");
 // 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=c339b1fa&
+// 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=03999292&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -4229,13 +4229,9 @@ var render = function () {
                                                   _vm._v(
                                                     "\n                " +
                                                       _vm._s(
-                                                        _vm.isObject(
+                                                        _vm.getLabel(
                                                           _vm.selected[0]
                                                         )
-                                                          ? _vm.selected[0][
-                                                              _vm.labelKey
-                                                            ]
-                                                          : _vm.selected[0]
                                                       ) +
                                                       "\n              "
                                                   ),
@@ -4598,7 +4594,13 @@ var render = function () {
                                 },
                                 [
                                   _c("span", [
-                                    _vm._v(_vm._s(item[_vm.labelKey])),
+                                    _vm._v(
+                                      "\n              " +
+                                        _vm._s(_vm.getDep(item)) +
+                                        "\n              " +
+                                        _vm._s(item[_vm.labelKey]) +
+                                        "\n            "
+                                    ),
                                   ]),
                                 ]
                               )
@@ -4696,7 +4698,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=c339b1fa&
+// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=03999292&
 
 // EXTERNAL MODULE: ./src/utils/util.js
 var util = __webpack_require__(0);
@@ -4933,6 +4935,7 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
 //
 //
 //
+//
 
 
 
@@ -5027,7 +5030,14 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
       type: [String, Number],
       default: -1
     },
+    //是否显示搜索框
     filterable: Boolean,
+    //搜索列表是否显示部门信息
+    showFilterListDep: {
+      type: Boolean,
+      default: true
+    },
+    //是否根据搜索值创建新的数据
     createable: Boolean,
     showButton: Boolean,
     button: Object,
@@ -5212,8 +5222,12 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
         }
       });
     },
-    isObject: function isObject(obj) {
-      return util["a" /* default */].isObject(obj);
+    getDep: function getDep(res) {
+      if (!this.showFilterListDep) {
+        return '';
+      }
+      var attr = res.attr ? JSON.parse(res.attr) : null;
+      return attr && attr.depShortName ? '[' + attr.depShortName + ']' : '';
     },
     getValueKey: function getValueKey(obj) {
       return util["a" /* default */].isObject(obj) ? obj[this.valueKey] : obj;
@@ -5388,8 +5402,10 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
       var tag = '';
       if (this.mix) {
         tag = util["a" /* default */].getTypeName(res.stype);
+      } else if (this.showFilterListDep) {
+        tag = this.getDep(res);
       }
-      return tag + (res[this.labelKey] ? res[this.labelKey] : res.label || res[this.valueKey]);
+      return tag + (typeof res == 'string' ? res : res[this.labelKey] ? res[this.labelKey] : res.label || res[this.valueKey]);
     }
   },
   beforeDestroy: function beforeDestroy() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.70",
+  "version": "0.6.71",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/flow/src/main.vue

@@ -1092,7 +1092,7 @@ export default {
     return {
       styles: {},
       optionsKey: 0,
-      showCirculate: false,
+      showCirculate: undefined,
       circulateForm: { nextNodeId: '111' },
       userModel: {},
       simpleTips: true,
@@ -1281,15 +1281,17 @@ export default {
   mounted() {
     this.businessIds = this.businessId;
     this.nextNode.nextNodeId = this.nextNodeId;
-    this.getInfo();
+    if(!this.isFlow){
+      this.getInfo();
+    }
   },
   watch: {
     isCirculate: {
       handler(val) {
-        this.showCirculate = val;
-        if (!val) {
+        if (!val && this.showCirculate != undefined) {
           this.getInfo();
         }
+        this.showCirculate = val;
       },
       deep: true,
       immediate: true

package/packages/main/src/public/search.vue

@@ -131,7 +131,7 @@
         </el-tab-pane>
       </template>
     </el-tabs>
-    <es-dialog :title="title" :visible.sync="visible" size="lg">
+    <es-dialog :title="title" :visible.sync="visible" size="max">
       <iframe width="100%" height="100%" frameborder="0" :src="url"></iframe>
     </es-dialog>
   </div>
@@ -325,20 +325,16 @@ export default {
             this.isLoading = false;
             this.types[i].records = this.searchData(this.menus, keyWords);
             this.types[i].totalCount = this.types[i].records.length;
-            this.types[i].pageCount = Math.ceil(
-              this.types[i].records.length / this.pageSize
-            );
-            this.types[i].pageNum = 0;
+            this.types[i].pageCount = 1;
+            this.types[i].pageNum = 1;
             this.$set(this.loadings, item.id || String(i), false);
             this.$set(this.noMore, item.id || String(i), true);
           } else if (item.name == '应用' && this.apps.length) {
             this.isLoading = false;
             this.types[i].records = this.searchData(this.apps, keyWords);
             this.types[i].totalCount = this.types[i].records.length;
-            this.types[i].pageCount = Math.ceil(
-              this.types[i].records.length / this.pageSize
-            );
-            this.types[i].pageNum = 0;
+            this.types[i].pageCount = 1;
+            this.types[i].pageNum = 1;
             this.$set(this.loadings, item.id || String(i), false);
             this.$set(this.noMore, item.id || String(i), true);
           } else if (item.dataRequestUrl) {

package/packages/selector/src/main.vue

@@ -39,9 +39,7 @@
                 @close="deleteTag($event, selected[0])"
               >
                 <span class="el-select__tags-text">
-                  {{
-                    isObject(selected[0]) ? selected[0][labelKey] : selected[0]
-                  }}
+                  {{ getLabel(selected[0]) }}
                 </span>
               </el-tag>
               <el-tag
@@ -181,7 +179,10 @@
               class="es-selector-dropdown-item"
               :class="{ 'es-selected': item.selected }"
             >
-              <span>{{ item[labelKey] }}</span>
+              <span>
+                {{ getDep(item) }}
+                {{ item[labelKey] }}
+              </span>
             </li>
           </el-scrollbar>
           <p v-if="options.length == 0" class="el-select-dropdown__empty">
@@ -316,7 +317,14 @@ export default {
       type: [String, Number],
       default: -1
     },
+    //是否显示搜索框
     filterable: Boolean,
+    //搜索列表是否显示部门信息
+    showFilterListDep: {
+      type: Boolean,
+      default: true
+    },
+    //是否根据搜索值创建新的数据
     createable: Boolean,
     showButton: Boolean,
     button: Object,
@@ -503,8 +511,12 @@ export default {
           }
         });
     },
-    isObject(obj) {
-      return util.isObject(obj);
+    getDep(res) {
+      if (!this.showFilterListDep) {
+        return '';
+      }
+      const attr = res.attr ? JSON.parse(res.attr) : null;
+      return attr && attr.depShortName ? `[${attr.depShortName}]` : '';
     },
     getValueKey(obj) {
       return util.isObject(obj) ? obj[this.valueKey] : obj;
@@ -692,10 +704,14 @@ export default {
       let tag = '';
       if (this.mix) {
         tag = util.getTypeName(res.stype);
+      } else if (this.showFilterListDep) {
+        tag = this.getDep(res);
       }
       return (
         tag +
-        (res[this.labelKey]
+        (typeof res == 'string'
+          ? res
+          : res[this.labelKey]
           ? res[this.labelKey]
           : res.label || res[this.valueKey])
       );

package/src/index.js

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