eoss-ui 0.8.12 → 0.8.13

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (10) hide show
  1. package/lib/eoss-ui.common.js +138 -114
  2. package/lib/flow.js +132 -108
  3. package/lib/index.js +1 -1
  4. package/lib/theme-chalk/flow.css +1 -1
  5. package/lib/theme-chalk/index.css +1 -1
  6. package/package.json +1 -1
  7. package/packages/flow/src/component/Circulate.vue +1 -0
  8. package/packages/flow/src/main.vue +16 -9
  9. package/packages/theme-chalk/src/flow.scss +3 -0
  10. package/src/index.js +1 -1
package/lib/flow.js CHANGED
@@ -4834,7 +4834,7 @@ module.exports = require("vuedraggable");
4834
4834
  // ESM COMPAT FLAG
4835
4835
  __webpack_require__.r(__webpack_exports__);
4836
4836
 
4837
- // 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=5f0c32cd&
4837
+ // 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=8f765236&
4838
4838
  var render = function () {
4839
4839
  var _vm = this
4840
4840
  var _h = _vm.$createElement
@@ -4965,104 +4965,121 @@ var render = function () {
4965
4965
  (_vm.formLabelPosition == "left"
4966
4966
  ? "form-left"
4967
4967
  : "form-right"),
4968
+ style: { flex: _vm.fullFlow ? "1" : "unset" },
4968
4969
  },
4969
4970
  [
4970
- _c(
4971
- "el-form",
4972
- {
4973
- ref: "form",
4974
- attrs: {
4975
- model: _vm.circulateForm,
4976
- "label-width": "120px",
4977
- "label-position": _vm.formLabelPosition,
4978
- },
4979
- },
4980
- [
4981
- _c(
4982
- "el-form-item",
4971
+ _vm.showCirculate
4972
+ ? _c(
4973
+ "el-form",
4983
4974
  {
4984
- staticStyle: { "margin-top": "20px" },
4985
- attrs: { prop: "nextNodeId", label: "下步节点" },
4975
+ ref: "form",
4976
+ attrs: {
4977
+ model: _vm.circulateForm,
4978
+ "label-width": "120px",
4979
+ "label-position": _vm.formLabelPosition,
4980
+ },
4986
4981
  },
4987
4982
  [
4988
- _vm.nextNodeCheckType == "select"
4989
- ? _c(
4990
- "el-select",
4991
- {
4992
- staticStyle: { width: "100% !important" },
4993
- attrs: { placeholder: "请选择下步节点" },
4994
- model: {
4995
- value: _vm.circulateForm.nextNodeId,
4996
- callback: function ($$v) {
4997
- _vm.$set(
4998
- _vm.circulateForm,
4999
- "nextNodeId",
5000
- $$v
5001
- )
4983
+ _c(
4984
+ "el-form-item",
4985
+ {
4986
+ staticStyle: { "margin-top": "20px" },
4987
+ attrs: {
4988
+ prop: "nextNodeId",
4989
+ label: "下步节点",
4990
+ },
4991
+ },
4992
+ [
4993
+ _vm.nextNodeCheckType == "select"
4994
+ ? _c(
4995
+ "el-select",
4996
+ {
4997
+ staticStyle: {
4998
+ width: "100% !important",
4999
+ },
5000
+ attrs: {
5001
+ placeholder: "请选择下步节点",
5002
+ },
5003
+ model: {
5004
+ value: _vm.circulateForm.nextNodeId,
5005
+ callback: function ($$v) {
5006
+ _vm.$set(
5007
+ _vm.circulateForm,
5008
+ "nextNodeId",
5009
+ $$v
5010
+ )
5011
+ },
5012
+ expression:
5013
+ "circulateForm.nextNodeId",
5014
+ },
5002
5015
  },
5003
- expression: "circulateForm.nextNodeId",
5004
- },
5005
- },
5006
- [
5007
- _c("el-option", {
5008
- attrs: { label: "传阅", value: "111" },
5009
- }),
5010
- ],
5011
- 1
5012
- )
5013
- : _vm.nextNodeCheckType == "radio"
5014
- ? _c("es-radio-group", {
5015
- attrs: {
5016
- data: [
5017
- { nodeId: "111", nodeName: "传阅" },
5018
- ],
5019
- "value-key": "nodeId",
5020
- "label-key": "nodeName",
5021
- },
5022
- model: {
5023
- value: _vm.circulateForm.nextNodeId,
5024
- callback: function ($$v) {
5025
- _vm.$set(
5026
- _vm.circulateForm,
5027
- "nextNodeId",
5028
- $$v
5029
- )
5030
- },
5031
- expression: "circulateForm.nextNodeId",
5032
- },
5033
- })
5034
- : _vm._e(),
5016
+ [
5017
+ _c("el-option", {
5018
+ attrs: {
5019
+ label: "传阅",
5020
+ value: "111",
5021
+ },
5022
+ }),
5023
+ ],
5024
+ 1
5025
+ )
5026
+ : _vm.nextNodeCheckType == "radio"
5027
+ ? _c("es-radio-group", {
5028
+ attrs: {
5029
+ data: [
5030
+ { nodeId: "111", nodeName: "传阅" },
5031
+ ],
5032
+ "value-key": "nodeId",
5033
+ "label-key": "nodeName",
5034
+ },
5035
+ model: {
5036
+ value: _vm.circulateForm.nextNodeId,
5037
+ callback: function ($$v) {
5038
+ _vm.$set(
5039
+ _vm.circulateForm,
5040
+ "nextNodeId",
5041
+ $$v
5042
+ )
5043
+ },
5044
+ expression:
5045
+ "circulateForm.nextNodeId",
5046
+ },
5047
+ })
5048
+ : _vm._e(),
5049
+ ],
5050
+ 1
5051
+ ),
5035
5052
  ],
5036
5053
  1
5037
- ),
5038
- ],
5039
- 1
5040
- ),
5041
- _c("circulate", {
5042
- ref: "circulate",
5043
- staticStyle: { "margin-top": "10px" },
5044
- attrs: {
5045
- businessId: _vm.businessIds,
5046
- "label-position": _vm.formLabelPosition,
5047
- showTooltip: _vm.showTooltip,
5048
- selectorParams: _vm.selectorParams,
5049
- "pending-id": _vm.pendingId,
5050
- showBtn: false,
5051
- formTitle: _vm.formTitle,
5052
- flowLabelConfig: _vm.flowLabelConfig,
5053
- hideMessage: _vm.hideMessage,
5054
- startFlowPageEmbeddedIntoStartFlowIndex:
5055
- _vm.startFlowPageEmbeddedIntoStartFlowIndex,
5056
- processDefinitionId: _vm.nodeInfo.nextNode,
5057
- simpleTips: _vm.simpleTips,
5058
- oldOption: _vm.value,
5059
- },
5060
- on: {
5061
- cancel: function ($event) {
5062
- _vm.closeProcess($event, "circulateVisible")
5063
- },
5064
- },
5065
- }),
5054
+ )
5055
+ : _vm._e(),
5056
+ _vm.showCirculate
5057
+ ? _c("circulate", {
5058
+ ref: "circulate",
5059
+ staticStyle: { "margin-top": "10px" },
5060
+ attrs: {
5061
+ businessId: _vm.businessIds,
5062
+ "label-position": _vm.formLabelPosition,
5063
+ showTooltip: _vm.showTooltip,
5064
+ selectorParams: _vm.selectorParams,
5065
+ "pending-id": _vm.pendingId,
5066
+ showBtn: false,
5067
+ formTitle: _vm.formTitle,
5068
+ flowLabelConfig: _vm.flowLabelConfig,
5069
+ hideMessage: _vm.hideMessage,
5070
+ startFlowPageEmbeddedIntoStartFlowIndex:
5071
+ _vm.startFlowPageEmbeddedIntoStartFlowIndex,
5072
+ processDefinitionId: _vm.nodeInfo.nextNode,
5073
+ simpleTips: _vm.simpleTips,
5074
+ oldOption: _vm.value,
5075
+ },
5076
+ on: {
5077
+ cancel: function ($event) {
5078
+ _vm.closeProcess($event, "circulateVisible")
5079
+ },
5080
+ },
5081
+ })
5082
+ : _vm._e(),
5066
5083
  ],
5067
5084
  1
5068
5085
  ),
@@ -5424,6 +5441,7 @@ var render = function () {
5424
5441
  (_vm.formLabelPosition == "left"
5425
5442
  ? "form-left"
5426
5443
  : "form-right"),
5444
+ style: { flex: _vm.fullFlow ? "1" : "unset" },
5427
5445
  },
5428
5446
  [
5429
5447
  _c(
@@ -5452,11 +5470,7 @@ var render = function () {
5452
5470
  prop: "nextNode",
5453
5471
  label: "选择流程",
5454
5472
  rules: [
5455
- {
5456
- required: true,
5457
- message: "请选择流程",
5458
- trigger: "blur",
5459
- },
5473
+ // { required: true, message: `请选择流程`, trigger: 'blur' }
5460
5474
  ],
5461
5475
  },
5462
5476
  },
@@ -7902,7 +7916,7 @@ var staticRenderFns = []
7902
7916
  render._withStripped = true
7903
7917
 
7904
7918
 
7905
- // CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=5f0c32cd&
7919
+ // CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=8f765236&
7906
7920
 
7907
7921
  // EXTERNAL MODULE: external "babel-runtime/regenerator"
7908
7922
  var regenerator_ = __webpack_require__(4);
@@ -23254,8 +23268,8 @@ var supervise_component = Object(componentNormalizer["a" /* default */])(
23254
23268
  )
23255
23269
 
23256
23270
  /* harmony default export */ var supervise = (supervise_component.exports);
23257
- // 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/Circulate.vue?vue&type=template&id=535aafac&
23258
- var Circulatevue_type_template_id_535aafac_render = function () {
23271
+ // 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/Circulate.vue?vue&type=template&id=6d27b4d0&
23272
+ var Circulatevue_type_template_id_6d27b4d0_render = function () {
23259
23273
  var _vm = this
23260
23274
  var _h = _vm.$createElement
23261
23275
  var _c = _vm._self._c || _h
@@ -23443,11 +23457,11 @@ var Circulatevue_type_template_id_535aafac_render = function () {
23443
23457
  1
23444
23458
  )
23445
23459
  }
23446
- var Circulatevue_type_template_id_535aafac_staticRenderFns = []
23447
- Circulatevue_type_template_id_535aafac_render._withStripped = true
23460
+ var Circulatevue_type_template_id_6d27b4d0_staticRenderFns = []
23461
+ Circulatevue_type_template_id_6d27b4d0_render._withStripped = true
23448
23462
 
23449
23463
 
23450
- // CONCATENATED MODULE: ./packages/flow/src/component/Circulate.vue?vue&type=template&id=535aafac&
23464
+ // CONCATENATED MODULE: ./packages/flow/src/component/Circulate.vue?vue&type=template&id=6d27b4d0&
23451
23465
 
23452
23466
  // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/flow/src/component/Circulate.vue?vue&type=script&lang=js&
23453
23467
  var Circulatevue_type_script_lang_js_components;
@@ -23589,6 +23603,7 @@ var Circulatevue_type_script_lang_js_components;
23589
23603
  nextOtherOrgObj: [],
23590
23604
  nextCurrentOrgObj: [],
23591
23605
  noticeType: [],
23606
+ noticeList: [],
23592
23607
  noticeInfo: '',
23593
23608
  opinion: ''
23594
23609
  },
@@ -23867,8 +23882,8 @@ var Circulatevue_type_script_lang_js_components;
23867
23882
 
23868
23883
  var Circulate_component = Object(componentNormalizer["a" /* default */])(
23869
23884
  component_Circulatevue_type_script_lang_js_,
23870
- Circulatevue_type_template_id_535aafac_render,
23871
- Circulatevue_type_template_id_535aafac_staticRenderFns,
23885
+ Circulatevue_type_template_id_6d27b4d0_render,
23886
+ Circulatevue_type_template_id_6d27b4d0_staticRenderFns,
23872
23887
  false,
23873
23888
  null,
23874
23889
  null,
@@ -25672,6 +25687,9 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
25672
25687
  //
25673
25688
  //
25674
25689
  //
25690
+ //
25691
+ //
25692
+ //
25675
25693
 
25676
25694
 
25677
25695
 
@@ -27557,10 +27575,12 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
27557
27575
  if (!_this32.isFlow) _this32.getFile(_this32.pendingId, attachedCode);
27558
27576
  if (nextNodeList && nextNodeList.length != 0) {
27559
27577
  _this32.nextNodeList = nextNodeList;
27560
- if (nextNodeList[0].nodeType === 'endEvent') {
27561
- _this32.isNextUser = nextNodeList[0].nodeType != 'endEvent';
27562
- nextNodeList[0].nodeType === 'endEvent' ? _this32.endFlow = true : '';
27563
- }
27578
+ // if (nextNodeList[0].nodeType === 'endEvent') {
27579
+ // this.isNextUser = nextNodeList[0].nodeType != 'endEvent';
27580
+ // nextNodeList[0].nodeType === 'endEvent'
27581
+ // ? (this.endFlow = true)
27582
+ // : '';
27583
+ // }
27564
27584
  }
27565
27585
 
27566
27586
  if (canRemoveSignUserList && canRemoveSignUserList.length != 0) _this32.removeUsers = canRemoveSignUserList;
@@ -28036,6 +28056,10 @@ function mainvue_type_script_lang_js_asyncToGenerator(fn) { return function () {
28036
28056
  sendData: function sendData(freetype) {
28037
28057
  var _this38 = this;
28038
28058
 
28059
+ if (this.isFlow && !this.nodeInfo.nextNode) {
28060
+ this.$message.warning('请选择流程');
28061
+ return;
28062
+ }
28039
28063
  if (this.isFlow && this.nodeInfo.nextNode && this.startFlowPageEmbeddedIntoStartFlowIndex) {
28040
28064
  if (this.directCreateCircularReadWhenFlowStarted) {
28041
28065
  this.$refs.flowCirculate.subMit();