eoss-ui 0.6.70 → 0.6.71

package/lib/eoss-ui.common.js

@@ -26760,8 +26760,8 @@ form_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var packages_form = (form_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=5e28124e&
-var mainvue_type_template_id_5e28124e_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=38c7fa78&
+var mainvue_type_template_id_38c7fa78_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -29432,11 +29432,11 @@ var mainvue_type_template_id_5e28124e_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_5e28124e_staticRenderFns = []
-mainvue_type_template_id_5e28124e_render._withStripped = true
+var mainvue_type_template_id_38c7fa78_staticRenderFns = []
+mainvue_type_template_id_38c7fa78_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=5e28124e&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=38c7fa78&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/CommonOpinions.vue?vue&type=template&id=fdf49dec&
 var CommonOpinionsvue_type_template_id_fdf49dec_render = function () {
@@ -45188,7 +45188,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
     return _ref = {
       styles: {},
       optionsKey: 0,
-      showCirculate: false,
+      showCirculate: undefined,
       circulateForm: { nextNodeId: '111' },
       userModel: {},
       simpleTips: true,
@@ -45338,16 +45338,18 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
   mounted: function mounted() {
     this.businessIds = this.businessId;
     this.nextNode.nextNodeId = this.nextNodeId;
-    this.getInfo();
+    if (!this.isFlow) {
+      this.getInfo();
+    }
   },
 
   watch: {
     isCirculate: {
       handler: function handler(val) {
-        this.showCirculate = val;
-        if (!val) {
+        if (!val && this.showCirculate != undefined) {
           this.getInfo();
         }
+        this.showCirculate = val;
       },
 
       deep: true,
@@ -47365,8 +47367,8 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 
 var flow_src_main_component = normalizeComponent(
   packages_flow_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_5e28124e_render,
-  mainvue_type_template_id_5e28124e_staticRenderFns,
+  mainvue_type_template_id_38c7fa78_render,
+  mainvue_type_template_id_38c7fa78_staticRenderFns,
   false,
   null,
   null,
@@ -62754,8 +62756,8 @@ var online_component = normalizeComponent(
 )
 
 /* 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
@@ -63148,7 +63150,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
@@ -63170,11 +63172,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; };
@@ -63499,16 +63501,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) {
@@ -63637,8 +63639,8 @@ var searchvue_type_script_lang_js_extends = Object.assign || function (target) {
 
 var search_component = normalizeComponent(
   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,
@@ -75074,8 +75076,8 @@ select_ganged_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var select_ganged = (select_ganged_src_main);
-// 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&
-var mainvue_type_template_id_c339b1fa_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/src/main.vue?vue&type=template&id=03999292&
+var mainvue_type_template_id_03999292_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -75184,13 +75186,9 @@ var mainvue_type_template_id_c339b1fa_render = function () {
                                                   _vm._v(
                                                     "\n                " +
                                                       _vm._s(
-                                                        _vm.isObject(
+                                                        _vm.getLabel(
                                                           _vm.selected[0]
                                                         )
-                                                          ? _vm.selected[0][
-                                                              _vm.labelKey
-                                                            ]
-                                                          : _vm.selected[0]
                                                       ) +
                                                       "\n              "
                                                   ),
@@ -75553,7 +75551,13 @@ var mainvue_type_template_id_c339b1fa_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            "
+                                    ),
                                   ]),
                                 ]
                               )
@@ -75647,11 +75651,11 @@ var mainvue_type_template_id_c339b1fa_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_c339b1fa_staticRenderFns = []
-mainvue_type_template_id_c339b1fa_render._withStripped = true
+var mainvue_type_template_id_03999292_staticRenderFns = []
+mainvue_type_template_id_03999292_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: external "eoss-element/src/utils/clickoutside"
 var clickoutside_ = __webpack_require__(18);
@@ -75882,6 +75886,7 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
 //
 //
 //
+//
 
 
 
@@ -75976,7 +75981,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,
@@ -76161,8 +76173,12 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
         }
       });
     },
-    isObject: function isObject(obj) {
-      return utils_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 utils_util["a" /* default */].isObject(obj) ? obj[this.valueKey] : obj;
@@ -76337,8 +76353,10 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
       var tag = '';
       if (this.mix) {
         tag = utils_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() {
@@ -76364,8 +76382,8 @@ var clickoutside_default = /*#__PURE__*/__webpack_require__.n(clickoutside_);
 
 var selector_src_main_component = normalizeComponent(
   packages_selector_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_c339b1fa_render,
-  mainvue_type_template_id_c339b1fa_staticRenderFns,
+  mainvue_type_template_id_03999292_render,
+  mainvue_type_template_id_03999292_staticRenderFns,
   false,
   null,
   null,
@@ -90612,7 +90630,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.6.70',
+  version: '0.6.71',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow.js

@@ -4445,7 +4445,7 @@ var component = Object(componentNormalizer["a" /* default */])(
 // 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/flow/src/main.vue?vue&type=template&id=5e28124e&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/main.vue?vue&type=template&id=38c7fa78&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -7121,7 +7121,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=5e28124e&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=38c7fa78&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -22729,7 +22729,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     return _ref = {
       styles: {},
       optionsKey: 0,
-      showCirculate: false,
+      showCirculate: undefined,
       circulateForm: { nextNodeId: '111' },
       userModel: {},
       simpleTips: true,
@@ -22879,16 +22879,18 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
   mounted: function mounted() {
     this.businessIds = this.businessId;
     this.nextNode.nextNodeId = this.nextNodeId;
-    this.getInfo();
+    if (!this.isFlow) {
+      this.getInfo();
+    }
   },
 
   watch: {
     isCirculate: {
       handler: function handler(val) {
-        this.showCirculate = val;
-        if (!val) {
+        if (!val && this.showCirculate != undefined) {
           this.getInfo();
         }
+        this.showCirculate = val;
       },
 
       deep: true,