eoss-ui 0.4.47 → 0.4.48

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 (82) hide show
  1. package/lib/button-group.js +126 -20
  2. package/lib/button.js +126 -20
  3. package/lib/card.js +4 -4
  4. package/lib/cascader.js +4 -4
  5. package/lib/checkbox-group.js +132 -26
  6. package/lib/clients.js +4 -4
  7. package/lib/data-table-form.js +191 -77
  8. package/lib/data-table.js +134 -28
  9. package/lib/date-picker.js +133 -27
  10. package/lib/dialog.js +196 -75
  11. package/lib/editor.js +20 -63
  12. package/lib/enterprise.js +4 -4
  13. package/lib/eoss-ui.common.js +377 -172
  14. package/lib/error-page.js +4 -4
  15. package/lib/flow-group.js +126 -20
  16. package/lib/flow-list.js +127 -21
  17. package/lib/flow.js +182 -35
  18. package/lib/form.js +126 -20
  19. package/lib/handle-user.js +126 -20
  20. package/lib/handler.js +126 -20
  21. package/lib/icons.js +12 -12
  22. package/lib/index.js +1 -1
  23. package/lib/input-number.js +126 -20
  24. package/lib/input.js +130 -23
  25. package/lib/label.js +4 -4
  26. package/lib/login.js +155 -30
  27. package/lib/main.js +215 -38
  28. package/lib/mainComp.js +136 -32
  29. package/lib/menu.js +4 -4
  30. package/lib/nav.js +132 -26
  31. package/lib/notify.js +4 -4
  32. package/lib/page.js +126 -20
  33. package/lib/pagination.js +4 -4
  34. package/lib/player.js +144 -38
  35. package/lib/qr-code.js +134 -28
  36. package/lib/radio-group.js +126 -20
  37. package/lib/select-ganged.js +126 -20
  38. package/lib/select.js +126 -20
  39. package/lib/selector-panel.js +134 -28
  40. package/lib/selector.js +134 -28
  41. package/lib/sizer.js +126 -20
  42. package/lib/steps.js +133 -27
  43. package/lib/switch.js +126 -20
  44. package/lib/table-form.js +126 -20
  45. package/lib/tabs-panel.js +4 -4
  46. package/lib/tabs.js +133 -27
  47. package/lib/theme-chalk/form.css +1 -1
  48. package/lib/theme-chalk/handler.css +1 -1
  49. package/lib/theme-chalk/index.css +1 -1
  50. package/lib/theme-chalk/login.css +1 -1
  51. package/lib/theme-chalk/main.css +1 -1
  52. package/lib/tips.js +126 -20
  53. package/lib/toolbar.js +6 -4
  54. package/lib/tree-group.js +126 -20
  55. package/lib/tree.js +126 -20
  56. package/lib/upload.js +126 -20
  57. package/lib/utils/util.js +111 -5
  58. package/lib/wujie.js +126 -20
  59. package/lib/wxlogin.js +127 -21
  60. package/package.json +2 -4
  61. package/packages/data-table/src/column.vue +1 -0
  62. package/packages/editor/src/main.vue +4 -5
  63. package/packages/flow/src/main.vue +84 -36
  64. package/packages/input/src/main.vue +4 -3
  65. package/packages/login/src/main.vue +13 -1
  66. package/packages/login/src/resetPassword.vue +13 -7
  67. package/packages/main/src/settings.vue +28 -3
  68. package/packages/main/src/userinfo.vue +17 -3
  69. package/packages/mainComp/src/main.vue +1 -1
  70. package/packages/mainComp/src/userinfo.vue +11 -17
  71. package/packages/theme-chalk/lib/form.css +1 -1
  72. package/packages/theme-chalk/lib/handler.css +1 -1
  73. package/packages/theme-chalk/lib/index.css +1 -1
  74. package/packages/theme-chalk/lib/login.css +1 -1
  75. package/packages/theme-chalk/lib/main.css +1 -1
  76. package/packages/theme-chalk/src/form.scss +130 -0
  77. package/packages/theme-chalk/src/handler.scss +0 -3
  78. package/packages/theme-chalk/src/login.scss +47 -6
  79. package/packages/theme-chalk/src/main.scss +53 -1
  80. package/packages/toolbar/src/main.vue +2 -0
  81. package/src/index.js +1 -1
  82. package/src/utils/util.js +151 -43
package/lib/flow.js CHANGED
@@ -82,7 +82,7 @@ module.exports =
82
82
  /******/
83
83
  /******/
84
84
  /******/ // Load entry module and return exports
85
- /******/ return __webpack_require__(__webpack_require__.s = 29);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 27);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ([
@@ -91,13 +91,13 @@ module.exports =
91
91
 
92
92
  "use strict";
93
93
  /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
94
- /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
94
+ /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
95
95
  /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
96
- /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
96
+ /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
97
97
  /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
98
98
  /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
99
99
  /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
100
- /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
100
+ /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
101
101
  /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
102
102
  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
103
103
 
@@ -163,8 +163,7 @@ function delPendingRequest(config) {
163
163
  }
164
164
  }
165
165
  var ajax = function ajax(_ref) {
166
- var _ref$headers = _ref.headers,
167
- headers = _ref$headers === undefined ? {} : _ref$headers,
166
+ var headers = _ref.headers,
168
167
  method = _ref.method,
169
168
  url = _ref.url,
170
169
  _ref$host = _ref.host,
@@ -181,6 +180,7 @@ var ajax = function ajax(_ref) {
181
180
  defaults = _ref$defaults === undefined ? false : _ref$defaults,
182
181
  loading = _ref.loading;
183
182
 
183
+ var header = headers || {};
184
184
  if (!method) {
185
185
  if (format) {
186
186
  method = 'get';
@@ -350,9 +350,9 @@ var ajax = function ajax(_ref) {
350
350
  if (!mix) {
351
351
  params = {};
352
352
  }
353
- if (format) {
353
+ if (format && !headers) {
354
354
  data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
355
- headers['content-type'] = 'application/x-www-form-urlencoded';
355
+ header['content-type'] = 'application/x-www-form-urlencoded';
356
356
  }
357
357
  }
358
358
  return http({
@@ -360,7 +360,7 @@ var ajax = function ajax(_ref) {
360
360
  url: url,
361
361
  data: data,
362
362
  params: params,
363
- headers: headers
363
+ header: header
364
364
  });
365
365
  };
366
366
 
@@ -408,6 +408,108 @@ var browser = function browser() {
408
408
  }
409
409
  };
410
410
 
411
+ /**
412
+ * calcDateDayDiff
413
+ * @desc:时间计算-天数计算
414
+ * @author sutao
415
+ * @date 2023年11月10日
416
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
417
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
418
+ **/
419
+ var calcDateDayDiff = function calcDateDayDiff(date1, date2) {
420
+ if (date1 && date2) {
421
+ try {
422
+ // 尝试将输入转换为 Date 对象
423
+ var d1 = new Date(date1);
424
+ var d2 = new Date(date2);
425
+
426
+ // 检查转换是否成功
427
+ if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
428
+ throw new Error('日期格式不正确');
429
+ }
430
+
431
+ // 将日期转换为毫秒数
432
+ var timeDiff = Math.abs(d2.getTime() - d1.getTime());
433
+
434
+ // 计算天数
435
+ var days = Math.floor(timeDiff / (1000 * 60 * 60 * 24));
436
+
437
+ return days;
438
+ } catch (error) {
439
+ // 捕获错误并抛出
440
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error, 5);
441
+ }
442
+ }
443
+ };
444
+
445
+ /**
446
+ * calcDateHourDiff
447
+ * @desc:时间计算-小时计算
448
+ * @author sutao
449
+ * @date 2023年11月10日
450
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
451
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
452
+ **/
453
+ var calcDateHourDiff = function calcDateHourDiff(date1, date2) {
454
+ if (date1 && date2) {
455
+ try {
456
+ // 尝试将输入转换为 Date 对象
457
+ var d1 = new Date(date1);
458
+ var d2 = new Date(date2);
459
+
460
+ // 检查转换是否成功
461
+ if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
462
+ throw new Error('日期格式不正确');
463
+ }
464
+
465
+ // 将日期转换为毫秒数
466
+ var timeDiff = Math.abs(d2.getTime() - d1.getTime());
467
+
468
+ // 计算小时
469
+ var hours = Math.floor(timeDiff / (1000 * 60 * 60));
470
+
471
+ return hours;
472
+ } catch (error) {
473
+ // 使用 MessageBox.error 处理错误
474
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error.message, 5);
475
+ }
476
+ }
477
+ };
478
+
479
+ /**
480
+ * calcDateMinuteDiff
481
+ * @desc:时间计算-分钟计算
482
+ * @author sutao
483
+ * @date 2023年11月10日
484
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
485
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
486
+ **/
487
+ var calcDateMinuteDiff = function calcDateMinuteDiff(date1, date2) {
488
+ if (date1 && date2) {
489
+ try {
490
+ // 尝试将输入转换为 Date 对象
491
+ var d1 = new Date(date1);
492
+ var d2 = new Date(date2);
493
+
494
+ // 检查转换是否成功
495
+ if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
496
+ throw new Error('日期格式不正确');
497
+ }
498
+
499
+ // 将日期转换为毫秒数
500
+ var timeDiff = Math.abs(d2.getTime() - d1.getTime());
501
+
502
+ // 计算分钟
503
+ var minutes = Math.floor(timeDiff / (1000 * 60));
504
+
505
+ return minutes;
506
+ } catch (error) {
507
+ // 使用 MessageBox.error 处理错误
508
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error.message, 5);
509
+ }
510
+ }
511
+ };
512
+
411
513
  /**
412
514
  * debounce
413
515
  * @desc:添加js内容
@@ -2176,10 +2278,14 @@ var watermark = function watermark(option) {
2176
2278
  wrap.appendChild(docFrag);
2177
2279
  document.body.appendChild(wrap);
2178
2280
  };
2281
+
2179
2282
  /* harmony default export */ __webpack_exports__["a"] = ({
2180
2283
  ajax: ajax,
2181
2284
  arrUnique: arrUnique,
2182
2285
  browser: browser,
2286
+ calcDateDayDiff: calcDateDayDiff,
2287
+ calcDateHourDiff: calcDateHourDiff,
2288
+ calcDateMinuteDiff: calcDateMinuteDiff,
2183
2289
  debounce: debounce,
2184
2290
  delUrlParam: delUrlParam,
2185
2291
  domEval: domEval,
@@ -2563,6 +2669,12 @@ var formContents = '/config/admin/online/onlineForm/render';
2563
2669
 
2564
2670
  /***/ }),
2565
2671
  /* 2 */
2672
+ /***/ (function(module, exports) {
2673
+
2674
+ module.exports = require("eoss-element");
2675
+
2676
+ /***/ }),
2677
+ /* 3 */
2566
2678
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2567
2679
 
2568
2680
  "use strict";
@@ -2665,23 +2777,17 @@ function normalizeComponent(
2665
2777
  }
2666
2778
 
2667
2779
 
2668
- /***/ }),
2669
- /* 3 */
2670
- /***/ (function(module, exports) {
2671
-
2672
- module.exports = require("qs");
2673
-
2674
2780
  /***/ }),
2675
2781
  /* 4 */
2676
2782
  /***/ (function(module, exports) {
2677
2783
 
2678
- module.exports = require("axios");
2784
+ module.exports = require("qs");
2679
2785
 
2680
2786
  /***/ }),
2681
2787
  /* 5 */
2682
2788
  /***/ (function(module, exports) {
2683
2789
 
2684
- module.exports = require("eoss-element");
2790
+ module.exports = require("axios");
2685
2791
 
2686
2792
  /***/ }),
2687
2793
  /* 6 */
@@ -2854,7 +2960,7 @@ var util = __webpack_require__(0);
2854
2960
  // CONCATENATED MODULE: ./packages/flow/src/component/FileList.vue?vue&type=script&lang=js&
2855
2961
  /* harmony default export */ var component_FileListvue_type_script_lang_js_ = (FileListvue_type_script_lang_js_);
2856
2962
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
2857
- var componentNormalizer = __webpack_require__(2);
2963
+ var componentNormalizer = __webpack_require__(3);
2858
2964
 
2859
2965
  // CONCATENATED MODULE: ./packages/flow/src/component/FileList.vue
2860
2966
 
@@ -2893,16 +2999,14 @@ var component = Object(componentNormalizer["a" /* default */])(
2893
2999
  /* 24 */,
2894
3000
  /* 25 */,
2895
3001
  /* 26 */,
2896
- /* 27 */,
2897
- /* 28 */,
2898
- /* 29 */
3002
+ /* 27 */
2899
3003
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2900
3004
 
2901
3005
  "use strict";
2902
3006
  // ESM COMPAT FLAG
2903
3007
  __webpack_require__.r(__webpack_exports__);
2904
3008
 
2905
- // 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=b5452b5c&
3009
+ // 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=4ef7ee29&
2906
3010
  var render = function () {
2907
3011
  var _vm = this
2908
3012
  var _h = _vm.$createElement
@@ -4285,7 +4389,7 @@ var staticRenderFns = []
4285
4389
  render._withStripped = true
4286
4390
 
4287
4391
 
4288
- // CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=b5452b5c&
4392
+ // CONCATENATED MODULE: ./packages/flow/src/main.vue?vue&type=template&id=4ef7ee29&
4289
4393
 
4290
4394
  // EXTERNAL MODULE: external "babel-runtime/regenerator"
4291
4395
  var regenerator_ = __webpack_require__(9);
@@ -4604,7 +4708,7 @@ tablevue_type_template_id_508feae4_render._withStripped = true
4604
4708
  // CONCATENATED MODULE: ./packages/flow/src/table.vue?vue&type=script&lang=js&
4605
4709
  /* harmony default export */ var src_tablevue_type_script_lang_js_ = (tablevue_type_script_lang_js_);
4606
4710
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
4607
- var componentNormalizer = __webpack_require__(2);
4711
+ var componentNormalizer = __webpack_require__(3);
4608
4712
 
4609
4713
  // CONCATENATED MODULE: ./packages/flow/src/table.vue
4610
4714
 
@@ -12506,7 +12610,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
12506
12610
  * @param {String} val 当前选中值
12507
12611
  * @date 2022年5月25日
12508
12612
  **/
12509
- selecNext: function selecNext(val, type) {
12613
+ selecNext: function selecNext(val, type, isDef) {
12510
12614
  var _this13 = this;
12511
12615
 
12512
12616
  this.loading = util["a" /* default */].loading(this.$loading, '加载中...');
@@ -12520,7 +12624,36 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
12520
12624
  this.radioList = [];
12521
12625
 
12522
12626
  if (type) {
12627
+ this.nextNode.nextNodeId = '';
12628
+ this.nextNode.isReturnSubmitter = 0;
12629
+ this.nextNode.isUndertakeReply = 0;
12630
+ this.nextNode.isTakeAdviceReply = 0;
12631
+ this.nextNode.isUndertakeEnd = 0;
12632
+ this.nextNode.isTakeAdviceEnd = 0;
12633
+ this.nextNode.isReadDealReply = 0;
12634
+ this.nextNode.isReadDealEnd = 0;
12635
+ this.nextNode.isReturnRejectNode = 0;
12636
+ this.nextNode.isSerialSubmit = 0;
12523
12637
  this.nodeInfos = [];
12638
+ if (val == -1) {
12639
+ this.nextNode.isSerialSubmit = 1;
12640
+ } else if (val == 0) {} else if (val == 1) {} else if (val == 2) {
12641
+ this.nextNode.isReturnSubmitter = 1;
12642
+ } else if (val == 3) {
12643
+ this.nextNode.isUndertakeReply = 1;
12644
+ } else if (val == 4) {
12645
+ this.nextNode.isTakeAdviceReply = 1;
12646
+ } else if (val == 5) {
12647
+ this.nextNode.isUndertakeEnd = 1;
12648
+ } else if (val == 6) {
12649
+ this.nextNode.isTakeAdviceEnd = 1;
12650
+ } else if (val == 7) {
12651
+ this.nextNode.isReadDealReply = 1;
12652
+ } else if (val == 8) {
12653
+ this.nextNode.isReadDealEnd = 1;
12654
+ } else if (val == 9) {
12655
+ this.nextNode.isReturnRejectNode = 1;
12656
+ } else {}
12524
12657
  this.operationList.map(function (item) {
12525
12658
  if (item.key === val) {
12526
12659
  if (!item.taskNodeList) {
@@ -12551,7 +12684,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
12551
12684
  } else {
12552
12685
  this.isReject = false;
12553
12686
  }
12554
- this.getNodeInfo();
12687
+ if (isDef !== true) this.getNodeInfo();
12555
12688
  },
12556
12689
 
12557
12690
  /**
@@ -12641,7 +12774,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
12641
12774
  _this14.endFlowInfo.pOrgId = pOrgId;
12642
12775
  _this14.canPresetRead = canPresetRead;
12643
12776
  _this14.isCdjxjTaskHandle = isCdjxjTaskHandle;
12644
-
12777
+ _this14.operationList = taskOperations;
12645
12778
  _this14.customPresetHintMessage = customPresetHintMessage;
12646
12779
  if (canPresetRead) {
12647
12780
  var ids = nodeInfoMap.nodeExtAttr.presetReadCandinateIds.split(',');
@@ -12681,8 +12814,9 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
12681
12814
  }
12682
12815
  }
12683
12816
  });
12817
+ _this14.selecNext(_this14.nextNode.nextOperate, true, true);
12684
12818
  }
12685
- _this14.operationList = taskOperations;
12819
+
12686
12820
  if (nodeInfoMap && JSON.stringify(nodeInfoMap) != '{}') {
12687
12821
  if (nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList) {
12688
12822
  var notice = JSON.parse(nodeInfoMap.nodeExtAttr.nodeFixedOpinionSelectList);
@@ -12728,6 +12862,15 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
12728
12862
  _this14.taskExamineInfo.choiceDeptId = choiceDeptId;
12729
12863
  _this14.endFlowInfo.processType = taskExamine.processType;
12730
12864
  _this14.endFlowInfo.isReturnSubmitter = taskExamine.isReturnSubmitter;
12865
+ _this14.nextNode.isReturnSubmitter = taskExamine.isReturnSubmitter;
12866
+ _this14.nextNode.isUndertakeReply = taskExamine.isUndertakeReply;
12867
+ _this14.nextNode.isTakeAdviceReply = taskExamine.isTakeAdviceReply;
12868
+ _this14.nextNode.isUndertakeEnd = taskExamine.isUndertakeEnd;
12869
+ _this14.nextNode.isTakeAdviceEnd = taskExamine.isTakeAdviceEnd;
12870
+ _this14.nextNode.isReadDealReply = taskExamine.isReadDealReply;
12871
+ _this14.nextNode.isReadDealEnd = taskExamine.isReadDealEnd;
12872
+ _this14.nextNode.isReturnRejectNode = taskExamine.isReturnRejectNode;
12873
+ _this14.nextNode.isSerialSubmit = taskExamine.isSerialSubmit;
12731
12874
  _this14.endFlowInfo.isSubFlow = taskExamine.isSubFlow;
12732
12875
  _this14.endFlowInfo.isUndertakeReply = taskExamine.isUndertakeReply;
12733
12876
  _this14.endFlowInfo.isUndertakeEnd = taskExamine.isUndertakeEnd;
@@ -12737,7 +12880,8 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
12737
12880
  _this14.endFlowInfo.isReadDealReply = taskExamine.isReadDealReply;
12738
12881
  _this14.endFlowInfo.isReturnRejectNode = taskExamine.isReturnRejectNode;
12739
12882
  _this14.endFlowInfo.isSerialSubmit = taskExamine.isSerialSubmit;
12740
- _this14.endFlowInfo.isReadDealReply = taskExamine.isReadDealReplybusinessId;
12883
+ // this.endFlowInfo.isReadDealReply =
12884
+ // taskExamine.isReadDealReplybusinessId;
12741
12885
  _this14.endFlowInfo.appId = taskExamine.appId;
12742
12886
  _this14.endFlowInfo.businessId = taskExamine.businessId;
12743
12887
  _this14.endFlowInfo.processDefinitionId = taskExamine.processDefinitionId;
@@ -12782,7 +12926,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
12782
12926
  _this14.getNodeType();
12783
12927
  _this14.getNodeInfo();
12784
12928
  } else {
12785
- if (res.status === "taskCompleted") {
12929
+ if (res.status === 'taskCompleted') {
12786
12930
  _this14.shrinkAbled = true;
12787
12931
  _this14.$message.warning(res.message || '系统错误,请联系管理员!');
12788
12932
  } else {
@@ -12964,7 +13108,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
12964
13108
  switch (_context.prev = _context.next) {
12965
13109
  case 0:
12966
13110
  if (!valid) {
12967
- _context.next = 55;
13111
+ _context.next = 56;
12968
13112
  break;
12969
13113
  }
12970
13114
 
@@ -13070,10 +13214,13 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
13070
13214
  _this18.nextNode.isReturnRejectNode = 1;
13071
13215
  _this18.nextNode.processDefinitionId = _this18.processObj.taskExamine.processDefinitionId;
13072
13216
  }
13073
- _context.next = 31;
13217
+ if (_this18.nextNode.nextOperate == 9 || _this18.nextNode.nextOperate == 2) {
13218
+ delete _this18.nextNode.nextNodeId;
13219
+ }
13220
+ _context.next = 32;
13074
13221
  return _this18.saveInfo('subMit');
13075
13222
 
13076
- case 31:
13223
+ case 32:
13077
13224
  _this18.loading = util["a" /* default */].loading(_this18.$loading, '加载中...');
13078
13225
 
13079
13226
  notificationType = '';
@@ -13135,10 +13282,10 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
13135
13282
  }
13136
13283
  }));
13137
13284
 
13138
- case 55:
13285
+ case 56:
13139
13286
  return _context.abrupt('return', false);
13140
13287
 
13141
- case 56:
13288
+ case 57:
13142
13289
  case 'end':
13143
13290
  return _context.stop();
13144
13291
  }
package/lib/form.js CHANGED
@@ -82,7 +82,7 @@ module.exports =
82
82
  /******/
83
83
  /******/
84
84
  /******/ // Load entry module and return exports
85
- /******/ return __webpack_require__(__webpack_require__.s = 46);
85
+ /******/ return __webpack_require__(__webpack_require__.s = 44);
86
86
  /******/ })
87
87
  /************************************************************************/
88
88
  /******/ ({
@@ -92,13 +92,13 @@ module.exports =
92
92
 
93
93
  "use strict";
94
94
  /* harmony import */ var _config_api__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(1);
95
- /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4);
95
+ /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
96
96
  /* harmony import */ var axios__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(axios__WEBPACK_IMPORTED_MODULE_1__);
97
- /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
97
+ /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4);
98
98
  /* harmony import */ var qs__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(qs__WEBPACK_IMPORTED_MODULE_2__);
99
99
  /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(6);
100
100
  /* harmony import */ var json_bigint__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(json_bigint__WEBPACK_IMPORTED_MODULE_3__);
101
- /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(5);
101
+ /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(2);
102
102
  /* harmony import */ var eoss_element__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(eoss_element__WEBPACK_IMPORTED_MODULE_4__);
103
103
  var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
104
104
 
@@ -164,8 +164,7 @@ function delPendingRequest(config) {
164
164
  }
165
165
  }
166
166
  var ajax = function ajax(_ref) {
167
- var _ref$headers = _ref.headers,
168
- headers = _ref$headers === undefined ? {} : _ref$headers,
167
+ var headers = _ref.headers,
169
168
  method = _ref.method,
170
169
  url = _ref.url,
171
170
  _ref$host = _ref.host,
@@ -182,6 +181,7 @@ var ajax = function ajax(_ref) {
182
181
  defaults = _ref$defaults === undefined ? false : _ref$defaults,
183
182
  loading = _ref.loading;
184
183
 
184
+ var header = headers || {};
185
185
  if (!method) {
186
186
  if (format) {
187
187
  method = 'get';
@@ -351,9 +351,9 @@ var ajax = function ajax(_ref) {
351
351
  if (!mix) {
352
352
  params = {};
353
353
  }
354
- if (format) {
354
+ if (format && !headers) {
355
355
  data = qs__WEBPACK_IMPORTED_MODULE_2___default.a.stringify(data);
356
- headers['content-type'] = 'application/x-www-form-urlencoded';
356
+ header['content-type'] = 'application/x-www-form-urlencoded';
357
357
  }
358
358
  }
359
359
  return http({
@@ -361,7 +361,7 @@ var ajax = function ajax(_ref) {
361
361
  url: url,
362
362
  data: data,
363
363
  params: params,
364
- headers: headers
364
+ header: header
365
365
  });
366
366
  };
367
367
 
@@ -409,6 +409,108 @@ var browser = function browser() {
409
409
  }
410
410
  };
411
411
 
412
+ /**
413
+ * calcDateDayDiff
414
+ * @desc:时间计算-天数计算
415
+ * @author sutao
416
+ * @date 2023年11月10日
417
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
418
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
419
+ **/
420
+ var calcDateDayDiff = function calcDateDayDiff(date1, date2) {
421
+ if (date1 && date2) {
422
+ try {
423
+ // 尝试将输入转换为 Date 对象
424
+ var d1 = new Date(date1);
425
+ var d2 = new Date(date2);
426
+
427
+ // 检查转换是否成功
428
+ if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
429
+ throw new Error('日期格式不正确');
430
+ }
431
+
432
+ // 将日期转换为毫秒数
433
+ var timeDiff = Math.abs(d2.getTime() - d1.getTime());
434
+
435
+ // 计算天数
436
+ var days = Math.floor(timeDiff / (1000 * 60 * 60 * 24));
437
+
438
+ return days;
439
+ } catch (error) {
440
+ // 捕获错误并抛出
441
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error, 5);
442
+ }
443
+ }
444
+ };
445
+
446
+ /**
447
+ * calcDateHourDiff
448
+ * @desc:时间计算-小时计算
449
+ * @author sutao
450
+ * @date 2023年11月10日
451
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
452
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
453
+ **/
454
+ var calcDateHourDiff = function calcDateHourDiff(date1, date2) {
455
+ if (date1 && date2) {
456
+ try {
457
+ // 尝试将输入转换为 Date 对象
458
+ var d1 = new Date(date1);
459
+ var d2 = new Date(date2);
460
+
461
+ // 检查转换是否成功
462
+ if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
463
+ throw new Error('日期格式不正确');
464
+ }
465
+
466
+ // 将日期转换为毫秒数
467
+ var timeDiff = Math.abs(d2.getTime() - d1.getTime());
468
+
469
+ // 计算小时
470
+ var hours = Math.floor(timeDiff / (1000 * 60 * 60));
471
+
472
+ return hours;
473
+ } catch (error) {
474
+ // 使用 MessageBox.error 处理错误
475
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error.message, 5);
476
+ }
477
+ }
478
+ };
479
+
480
+ /**
481
+ * calcDateMinuteDiff
482
+ * @desc:时间计算-分钟计算
483
+ * @author sutao
484
+ * @date 2023年11月10日
485
+ * @param {String/Object/Number} [date1] - 时间对象、字符串、时间戳
486
+ * @param {String/Object/Number} [date2] - 时间对象、字符串、时间戳
487
+ **/
488
+ var calcDateMinuteDiff = function calcDateMinuteDiff(date1, date2) {
489
+ if (date1 && date2) {
490
+ try {
491
+ // 尝试将输入转换为 Date 对象
492
+ var d1 = new Date(date1);
493
+ var d2 = new Date(date2);
494
+
495
+ // 检查转换是否成功
496
+ if (isNaN(d1.getTime()) || isNaN(d2.getTime())) {
497
+ throw new Error('日期格式不正确');
498
+ }
499
+
500
+ // 将日期转换为毫秒数
501
+ var timeDiff = Math.abs(d2.getTime() - d1.getTime());
502
+
503
+ // 计算分钟
504
+ var minutes = Math.floor(timeDiff / (1000 * 60));
505
+
506
+ return minutes;
507
+ } catch (error) {
508
+ // 使用 MessageBox.error 处理错误
509
+ eoss_element__WEBPACK_IMPORTED_MODULE_4__["MessageBox"].error(error.message, 5);
510
+ }
511
+ }
512
+ };
513
+
412
514
  /**
413
515
  * debounce
414
516
  * @desc:添加js内容
@@ -2177,10 +2279,14 @@ var watermark = function watermark(option) {
2177
2279
  wrap.appendChild(docFrag);
2178
2280
  document.body.appendChild(wrap);
2179
2281
  };
2282
+
2180
2283
  /* harmony default export */ __webpack_exports__["a"] = ({
2181
2284
  ajax: ajax,
2182
2285
  arrUnique: arrUnique,
2183
2286
  browser: browser,
2287
+ calcDateDayDiff: calcDateDayDiff,
2288
+ calcDateHourDiff: calcDateHourDiff,
2289
+ calcDateMinuteDiff: calcDateMinuteDiff,
2184
2290
  debounce: debounce,
2185
2291
  delUrlParam: delUrlParam,
2186
2292
  domEval: domEval,
@@ -2591,6 +2697,13 @@ var bankCard = { pattern: new RegExp('^([1-9]{1})(\\d{14}|\\d{18})$'), message:
2591
2697
  /***/ }),
2592
2698
 
2593
2699
  /***/ 2:
2700
+ /***/ (function(module, exports) {
2701
+
2702
+ module.exports = require("eoss-element");
2703
+
2704
+ /***/ }),
2705
+
2706
+ /***/ 3:
2594
2707
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2595
2708
 
2596
2709
  "use strict";
@@ -2693,23 +2806,16 @@ function normalizeComponent(
2693
2806
  }
2694
2807
 
2695
2808
 
2696
- /***/ }),
2697
-
2698
- /***/ 3:
2699
- /***/ (function(module, exports) {
2700
-
2701
- module.exports = require("qs");
2702
-
2703
2809
  /***/ }),
2704
2810
 
2705
2811
  /***/ 4:
2706
2812
  /***/ (function(module, exports) {
2707
2813
 
2708
- module.exports = require("axios");
2814
+ module.exports = require("qs");
2709
2815
 
2710
2816
  /***/ }),
2711
2817
 
2712
- /***/ 46:
2818
+ /***/ 44:
2713
2819
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
2714
2820
 
2715
2821
  "use strict";
@@ -17795,7 +17901,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
17795
17901
  // CONCATENATED MODULE: ./packages/form/src/main.vue?vue&type=script&lang=js&
17796
17902
  /* harmony default export */ var src_mainvue_type_script_lang_js_ = (mainvue_type_script_lang_js_);
17797
17903
  // EXTERNAL MODULE: ./node_modules/vue-loader/lib/runtime/componentNormalizer.js
17798
- var componentNormalizer = __webpack_require__(2);
17904
+ var componentNormalizer = __webpack_require__(3);
17799
17905
 
17800
17906
  // CONCATENATED MODULE: ./packages/form/src/main.vue
17801
17907
 
@@ -17831,7 +17937,7 @@ main.install = function (Vue) {
17831
17937
  /***/ 5:
17832
17938
  /***/ (function(module, exports) {
17833
17939
 
17834
- module.exports = require("eoss-element");
17940
+ module.exports = require("axios");
17835
17941
 
17836
17942
  /***/ }),
17837
17943