eoss-ui 0.8.2 → 0.8.4

package/lib/data-table.js

@@ -4656,8 +4656,8 @@ module.exports = require("throttle-debounce");
 // 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/data-table/src/main.vue?vue&type=template&id=d5922368&
-var mainvue_type_template_id_d5922368_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=339d1ec1&
+var mainvue_type_template_id_339d1ec1_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -5059,10 +5059,10 @@ var mainvue_type_template_id_d5922368_render = function () {
   )
 }
 var staticRenderFns = []
-mainvue_type_template_id_d5922368_render._withStripped = true
+mainvue_type_template_id_339d1ec1_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=d5922368&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=339d1ec1&
 
 // EXTERNAL MODULE: ./src/config/api.js
 var api = __webpack_require__(1);
@@ -7512,6 +7512,7 @@ var pageView = util["a" /* default */].getParams('pageView');
       default: false
     },
     readonly: Boolean,
+    allowToolbar: Boolean,
     url: {
       type: String,
       default: ''
@@ -7917,27 +7918,51 @@ var pageView = util["a" /* default */].getParams('pageView');
     },
     showToolbar: function showToolbar() {
       if (this.readonly) {
-        return false;
-      }
-      if (typeof this.toolbar === 'boolean') {
-        if (this.toolbar) {
-          this.toolbars = [{
-            type: 'search',
-            contents: [{
-              type: 'text',
-              name: 'keyword',
-              placeholder: '请输入关键字'
-            }]
-          }];
+        if (this.allowToolbar) {
+          if (typeof this.toolbar === 'boolean') {
+            if (this.toolbar) {
+              this.toolbars = [{
+                type: 'search',
+                contents: [{
+                  type: 'text',
+                  name: 'keyword',
+                  placeholder: '请输入关键字'
+                }]
+              }];
+            }
+            return this.toolbar;
+          } else if (Array.isArray(this.toolbar)) {
+            this.toolbars = this.toolbar;
+            return true;
+          } else {
+            this.toolbars = this.toolbar.contents;
+            this.toolbarEvents = this.toolbar.events || {};
+            return true;
+          }
+        } else {
+          return false;
         }
-        return this.toolbar;
-      } else if (Array.isArray(this.toolbar)) {
-        this.toolbars = this.toolbar;
-        return true;
       } else {
-        this.toolbars = this.toolbar.contents;
-        this.toolbarEvents = this.toolbar.events || {};
-        return true;
+        if (typeof this.toolbar === 'boolean') {
+          if (this.toolbar) {
+            this.toolbars = [{
+              type: 'search',
+              contents: [{
+                type: 'text',
+                name: 'keyword',
+                placeholder: '请输入关键字'
+              }]
+            }];
+          }
+          return this.toolbar;
+        } else if (Array.isArray(this.toolbar)) {
+          this.toolbars = this.toolbar;
+          return true;
+        } else {
+          this.toolbars = this.toolbar.contents;
+          this.toolbarEvents = this.toolbar.events || {};
+          return true;
+        }
       }
     },
 
@@ -8976,7 +9001,7 @@ var pageView = util["a" /* default */].getParams('pageView');
 
 var main_component = Object(componentNormalizer["a" /* default */])(
   src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_d5922368_render,
+  mainvue_type_template_id_339d1ec1_render,
   staticRenderFns,
   false,
   null,

package/lib/eoss-ui.common.js

@@ -9799,8 +9799,8 @@ clients_src_main.install = function (Vue) {
 };
 
 /* harmony default export */ var clients = (clients_src_main);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=d5922368&
-var mainvue_type_template_id_d5922368_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/main.vue?vue&type=template&id=339d1ec1&
+var mainvue_type_template_id_339d1ec1_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -10201,11 +10201,11 @@ var mainvue_type_template_id_d5922368_render = function () {
     1
   )
 }
-var mainvue_type_template_id_d5922368_staticRenderFns = []
-mainvue_type_template_id_d5922368_render._withStripped = true
+var mainvue_type_template_id_339d1ec1_staticRenderFns = []
+mainvue_type_template_id_339d1ec1_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=d5922368&
+// CONCATENATED MODULE: ./packages/data-table/src/main.vue?vue&type=template&id=339d1ec1&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/data-table/src/children.vue?vue&type=template&id=d07af914&
 var childrenvue_type_template_id_d07af914_render = function () {
@@ -12635,6 +12635,7 @@ var pageView = utils_util.getParams('pageView');
       default: false
     },
     readonly: Boolean,
+    allowToolbar: Boolean,
     url: {
       type: String,
       default: ''
@@ -13040,27 +13041,51 @@ var pageView = utils_util.getParams('pageView');
     },
     showToolbar: function showToolbar() {
       if (this.readonly) {
-        return false;
-      }
-      if (typeof this.toolbar === 'boolean') {
-        if (this.toolbar) {
-          this.toolbars = [{
-            type: 'search',
-            contents: [{
-              type: 'text',
-              name: 'keyword',
-              placeholder: '请输入关键字'
-            }]
-          }];
+        if (this.allowToolbar) {
+          if (typeof this.toolbar === 'boolean') {
+            if (this.toolbar) {
+              this.toolbars = [{
+                type: 'search',
+                contents: [{
+                  type: 'text',
+                  name: 'keyword',
+                  placeholder: '请输入关键字'
+                }]
+              }];
+            }
+            return this.toolbar;
+          } else if (Array.isArray(this.toolbar)) {
+            this.toolbars = this.toolbar;
+            return true;
+          } else {
+            this.toolbars = this.toolbar.contents;
+            this.toolbarEvents = this.toolbar.events || {};
+            return true;
+          }
+        } else {
+          return false;
         }
-        return this.toolbar;
-      } else if (Array.isArray(this.toolbar)) {
-        this.toolbars = this.toolbar;
-        return true;
       } else {
-        this.toolbars = this.toolbar.contents;
-        this.toolbarEvents = this.toolbar.events || {};
-        return true;
+        if (typeof this.toolbar === 'boolean') {
+          if (this.toolbar) {
+            this.toolbars = [{
+              type: 'search',
+              contents: [{
+                type: 'text',
+                name: 'keyword',
+                placeholder: '请输入关键字'
+              }]
+            }];
+          }
+          return this.toolbar;
+        } else if (Array.isArray(this.toolbar)) {
+          this.toolbars = this.toolbar;
+          return true;
+        } else {
+          this.toolbars = this.toolbar.contents;
+          this.toolbarEvents = this.toolbar.events || {};
+          return true;
+        }
       }
     },
 
@@ -14099,8 +14124,8 @@ var pageView = utils_util.getParams('pageView');
 
 var data_table_src_main_component = normalizeComponent(
   packages_data_table_src_mainvue_type_script_lang_js_,
-  mainvue_type_template_id_d5922368_render,
-  mainvue_type_template_id_d5922368_staticRenderFns,
+  mainvue_type_template_id_339d1ec1_render,
+  mainvue_type_template_id_339d1ec1_staticRenderFns,
   false,
   null,
   null,
@@ -28353,8 +28378,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=5f7f1248&
-var mainvue_type_template_id_5f7f1248_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=6a1416d2&
+var mainvue_type_template_id_6a1416d2_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -30525,7 +30550,8 @@ var mainvue_type_template_id_5f7f1248_render = function () {
                             : _vm._e(),
                           (_vm.nodeInfos.length > 0 ||
                             _vm.nodeInfo.option.length > 0 ||
-                            _vm.operationList.length > 0) &&
+                            _vm.operationList.length > 0 ||
+                            _vm.endFlow) &&
                           _vm.btnList.length <= 2
                             ? _c(
                                 "div",
@@ -31371,11 +31397,11 @@ var mainvue_type_template_id_5f7f1248_render = function () {
       )
     : _vm._e()
 }
-var mainvue_type_template_id_5f7f1248_staticRenderFns = []
-mainvue_type_template_id_5f7f1248_render._withStripped = true
+var mainvue_type_template_id_6a1416d2_staticRenderFns = []
+mainvue_type_template_id_6a1416d2_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=5f7f1248&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=6a1416d2&
 
 // 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=7b4f1542&
 var CommonOpinionsvue_type_template_id_7b4f1542_render = function () {
@@ -49141,6 +49167,7 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
 //
 //
 //
+//
 
 
 
@@ -50683,12 +50710,14 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
     selecNext: function selecNext(val, type, isDef) {
       var _this30 = this;
 
-      console.log(val, 'selecNext');
       var isNextNode = false;
-      if (type) {
-        isNextNode = this.operationList.filter(function (x) {
+      if (type && val && this.operationList.length > 0) {
+        var arr = this.operationList.filter(function (x) {
           return x.key == val;
-        })[0].isNextNode;
+        });
+        if (arr.length > 0) {
+          isNextNode = arr[0].isNextNode;
+        }
       }
       this.loading = utils_util.loading(this.$loading, '加载中...');
       if (this.multiple) {
@@ -50712,7 +50741,9 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
         this.isShowNode = false;
         this.isMainSubProcess = false;
         this.isNodeShowProcess = false;
-        this.endFlow = false;
+        if (!isDef) {
+          this.endFlow = false;
+        }
         this.nextNode.nextNodeId = '';
         this.nextNode.isReturnSubmitter = 0;
         this.nextNode.isUndertakeReply = 0;
@@ -50807,8 +50838,11 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
           return;
         } else {}
       }
-
-      this.getNodeInfo();
+      if (this.endFlow && isDef) {
+        this.loading.close();
+      } else {
+        this.getNodeInfo();
+      }
     },
 
     /**
@@ -50993,7 +51027,12 @@ function flow_src_mainvue_type_script_lang_js_asyncToGenerator(fn) { return func
           if (!_this31.isFlow) _this31.getFile(_this31.pendingId, attachedCode);
           if (nextNodeList && nextNodeList.length != 0) {
             _this31.nextNodeList = nextNodeList;
+            if (nextNodeList[0].nodeType === 'endEvent') {
+              _this31.isNextUser = nextNodeList[0].nodeType != 'endEvent';
+              nextNodeList[0].nodeType === 'endEvent' ? _this31.endFlow = true : '';
+            }
           }
+
           if (canRemoveSignUserList && canRemoveSignUserList.length != 0) _this31.removeUsers = canRemoveSignUserList;
           if (taskOperations && taskOperations.length != 0) {
             var isSelected = false;
@@ -51835,8 +51874,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_5f7f1248_render,
-  mainvue_type_template_id_5f7f1248_staticRenderFns,
+  mainvue_type_template_id_6a1416d2_render,
+  mainvue_type_template_id_6a1416d2_staticRenderFns,
   false,
   null,
   null,
@@ -102616,7 +102655,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 /* harmony default export */ var src_0 = __webpack_exports__["default"] = ({
-  version: '0.8.2',
+  version: '0.8.4',
   install: install,
   Button: packages_button,
   ButtonGroup: button_group,

package/lib/flow.js

@@ -4827,7 +4827,7 @@ module.exports = require("vuedraggable");
 // 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=5f7f1248&
+// 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=6a1416d2&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -6999,7 +6999,8 @@ var render = function () {
                             : _vm._e(),
                           (_vm.nodeInfos.length > 0 ||
                             _vm.nodeInfo.option.length > 0 ||
-                            _vm.operationList.length > 0) &&
+                            _vm.operationList.length > 0 ||
+                            _vm.endFlow) &&
                           _vm.btnList.length <= 2
                             ? _c(
                                 "div",
@@ -7849,7 +7850,7 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=5f7f1248&
+// CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=6a1416d2&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -25473,6 +25474,7 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
 //
 //
 //
+//
 
 
 
@@ -27015,12 +27017,14 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
     selecNext: function selecNext(val, type, isDef) {
       var _this30 = this;
 
-      console.log(val, 'selecNext');
       var isNextNode = false;
-      if (type) {
-        isNextNode = this.operationList.filter(function (x) {
+      if (type && val && this.operationList.length > 0) {
+        var arr = this.operationList.filter(function (x) {
           return x.key == val;
-        })[0].isNextNode;
+        });
+        if (arr.length > 0) {
+          isNextNode = arr[0].isNextNode;
+        }
       }
       this.loading = util["a" /* default */].loading(this.$loading, '加载中...');
       if (this.multiple) {
@@ -27044,7 +27048,9 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
         this.isShowNode = false;
         this.isMainSubProcess = false;
         this.isNodeShowProcess = false;
-        this.endFlow = false;
+        if (!isDef) {
+          this.endFlow = false;
+        }
         this.nextNode.nextNodeId = '';
         this.nextNode.isReturnSubmitter = 0;
         this.nextNode.isUndertakeReply = 0;
@@ -27139,8 +27145,11 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
           return;
         } else {}
       }
-
-      this.getNodeInfo();
+      if (this.endFlow && isDef) {
+        this.loading.close();
+      } else {
+        this.getNodeInfo();
+      }
     },
 
     /**
@@ -27325,7 +27334,12 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
           if (!_this31.isFlow) _this31.getFile(_this31.pendingId, attachedCode);
           if (nextNodeList && nextNodeList.length != 0) {
             _this31.nextNodeList = nextNodeList;
+            if (nextNodeList[0].nodeType === 'endEvent') {
+              _this31.isNextUser = nextNodeList[0].nodeType != 'endEvent';
+              nextNodeList[0].nodeType === 'endEvent' ? _this31.endFlow = true : '';
+            }
           }
+
           if (canRemoveSignUserList && canRemoveSignUserList.length != 0) _this31.removeUsers = canRemoveSignUserList;
           if (taskOperations && taskOperations.length != 0) {
             var isSelected = false;