ecinc-cloud-wappaio 9.6.456 → 9.6.458

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.
@@ -10269,7 +10269,7 @@ var actions = {
10269
10269
  __webpack_require__.r(__webpack_exports__);
10270
10270
  /* harmony import */ var e_vue_contextmenu__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(28572);
10271
10271
  /* harmony import */ var e_vue_contextmenu__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(e_vue_contextmenu__WEBPACK_IMPORTED_MODULE_0__);
10272
- /* harmony import */ var _ecwplat_Module_index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(79447);
10272
+ /* harmony import */ var _ecwplat_Module_index__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(12317);
10273
10273
  /* harmony import */ var _websocket_index__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(31831);
10274
10274
  function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
10275
10275
  function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
@@ -12058,7 +12058,7 @@ module.exports = {
12058
12058
 
12059
12059
  /***/ }),
12060
12060
 
12061
- /***/ 79447:
12061
+ /***/ 12317:
12062
12062
  /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
12063
12063
 
12064
12064
  "use strict";
@@ -12072,7 +12072,7 @@ __webpack_require__.d(__webpack_exports__, {
12072
12072
  DY: function() { return /* binding */ Module_SysSetup; }
12073
12073
  });
12074
12074
 
12075
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/index.vue?vue&type=template&id=3801b56a&scoped=true
12075
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/index.vue?vue&type=template&id=7411b67a&scoped=true
12076
12076
  var render = function render() {
12077
12077
  var _vm = this,
12078
12078
  _c = _vm._self._c;
@@ -12387,6 +12387,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
12387
12387
  computed: _objectSpread({}, (0,vuex_esm/* mapGetters */.L8)(['loginUser'])),
12388
12388
  watch: {},
12389
12389
  created: function created() {
12390
+ var _this = this;
12390
12391
  this.$bus.emit('showNavSearch', false);
12391
12392
  console.log(this.$route.meta.params, 'this.$route.meta.params');
12392
12393
  if (this.$route.meta.params && this.$route.meta.params.indexOf('orgCode=') !== -1) {
@@ -12401,6 +12402,31 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
12401
12402
  this.loadSysSetup(this.row.orgCode);
12402
12403
  } else if (this.$route.meta.params && this.$route.meta.params.indexOf('isPortal=1') !== -1) {
12403
12404
  this.isPortal = true;
12405
+ this.$http({
12406
+ method: 'POST',
12407
+ contentType: 'application/x-www-form-urlencoded',
12408
+ data: [{
12409
+ compare: '=',
12410
+ field: 'sysType',
12411
+ value: 1
12412
+ }, {
12413
+ compare: '=',
12414
+ field: 'sysStatus',
12415
+ value: 1
12416
+ }, {
12417
+ compare: '!=',
12418
+ field: 'sysCode',
12419
+ value: 'eccloud'
12420
+ }],
12421
+ url: this.moduleInfo.loadSysSetupUrl
12422
+ }).then(function (res) {
12423
+ if (res.code === 'success') {
12424
+ //如果只有一个主系统,直接查询系统菜单
12425
+ if (res.body.listdata.length == 1) {
12426
+ _this.loadSysSetup(res.body.listdata[0].orgCode);
12427
+ }
12428
+ }
12429
+ });
12404
12430
  }
12405
12431
  this.$bus.on('setOrgItemTree', this.setOrgItem);
12406
12432
  },
@@ -12415,7 +12441,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
12415
12441
  this.loadSysSetup(orgCode);
12416
12442
  },
12417
12443
  loadSysSetup: function loadSysSetup(orgCode) {
12418
- var _this = this;
12444
+ var _this2 = this;
12419
12445
  this.orgCode = orgCode || this.orgCode;
12420
12446
  /**
12421
12447
  * 加载系统配置信息
@@ -12435,22 +12461,22 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
12435
12461
  url: this.moduleInfo.loadSysSetupUrl
12436
12462
  }).then(function (res) {
12437
12463
  if (res.code === 'success') {
12438
- _this.sysSetupList = res.body.listdata;
12464
+ _this2.sysSetupList = res.body.listdata;
12439
12465
  if (res.body.listdata.length > 0) {
12440
- _this.sys = res.body.listdata[0];
12466
+ _this2.sys = res.body.listdata[0];
12441
12467
  var sysCodes = [];
12442
12468
  res.body.listdata.forEach(function (sysSetup) {
12443
12469
  sysCodes.push(sysSetup.sysCode);
12444
12470
  });
12445
12471
  var list = [];
12446
- if (_this.row.sysCode) {
12472
+ if (_this2.row.sysCode) {
12447
12473
  res.body.listdata.forEach(function (item) {
12448
- if (item.sysCode === _this.row.sysCode) {
12474
+ if (item.sysCode === _this2.row.sysCode) {
12449
12475
  list.push(item);
12450
12476
  }
12451
12477
  });
12452
- } else if (_this.isPortal && localStorage.orgItem) {
12453
- var _sysCode = _this.isPortal && localStorage.orgItem ? JSON.parse(localStorage.orgItem).sysCode : '';
12478
+ } else if (_this2.isPortal && localStorage.orgItem) {
12479
+ var _sysCode = _this2.isPortal && localStorage.orgItem ? JSON.parse(localStorage.orgItem).sysCode : '';
12454
12480
  res.body.listdata.forEach(function (item) {
12455
12481
  if (item.sysCode === _sysCode) {
12456
12482
  list.push(item);
@@ -12462,36 +12488,36 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
12462
12488
  /**
12463
12489
  * 加载菜单树节点数据
12464
12490
  */
12465
- var sysCode = _this.isPortal && localStorage.orgItem ? JSON.parse(localStorage.orgItem).sysCode : '';
12466
- _this.$http({
12491
+ var sysCode = _this2.isPortal && localStorage.orgItem ? JSON.parse(localStorage.orgItem).sysCode : '';
12492
+ _this2.$http({
12467
12493
  method: 'POST',
12468
12494
  contentType: 'application/x-www-form-urlencoded',
12469
12495
  data: [{
12470
12496
  compare: 'in',
12471
12497
  field: 'sysCode',
12472
- value: sysCode || _this.row.sysCode || sysCodes.join(',')
12498
+ value: sysCode || _this2.row.sysCode || sysCodes.join(',')
12473
12499
  }],
12474
12500
  params: {
12475
- orderBy: 'moduleLevel asc,orderNo asc'
12501
+ orderBy: 'moduleLevel asc,topFlag desc,orderNo asc'
12476
12502
  },
12477
12503
  // 查询全部模块菜单,按菜单级别、序号排序
12478
- url: _this.moduleInfo.loadTreeNodeUrl
12504
+ url: _this2.moduleInfo.loadTreeNodeUrl
12479
12505
  }).then(function (res2) {
12480
12506
  if (res2.code === 'success') {
12481
- _this.treeData = _this.treeDataAdapter(list.concat(res2.body.listdata));
12507
+ _this2.treeData = _this2.treeDataAdapter(list.concat(res2.body.listdata));
12482
12508
  } else {
12483
- _this.$alert(res2.message, {
12509
+ _this2.$alert(res2.message, {
12484
12510
  type: 'error'
12485
12511
  });
12486
12512
  }
12487
12513
  });
12488
12514
  } else {
12489
- _this.$alert(_this.$tx('ecwplat.sysSetup.chooseAgain', '您所选择的单位未开通任何业务,请重新选择!'), _this.$tx('common.operationTip', '操作提示'), {
12515
+ _this2.$alert(_this2.$tx('ecwplat.sysSetup.chooseAgain', '您所选择的单位未开通任何业务,请重新选择!'), _this2.$tx('common.operationTip', '操作提示'), {
12490
12516
  type: 'warning'
12491
12517
  });
12492
12518
  }
12493
12519
  } else {
12494
- _this.$alert(res.message, {
12520
+ _this2.$alert(res.message, {
12495
12521
  type: 'error'
12496
12522
  });
12497
12523
  }
@@ -12516,6 +12542,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
12516
12542
  node.passenger.disallowAddSubMenu = true;
12517
12543
  }
12518
12544
  if (node.sysLicense !== undefined) {
12545
+ //业务开通系统配置数据sysSetup
12519
12546
  node.name = node.sysName;
12520
12547
  node.pId = null;
12521
12548
  node.open = true;
@@ -12528,11 +12555,15 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
12528
12555
  treeData.splice(i--, 1);
12529
12556
  }
12530
12557
  } else {
12558
+ //模块菜单数据
12531
12559
  if (node.parentId === '0') {
12532
12560
  node.pId = sysIds[node.sysCode];
12533
12561
  } else {
12534
12562
  node.pId = node.parentId;
12535
12563
  }
12564
+ if (node.moduleLevel === 1) {
12565
+ node.orderNo = (node.topFlag === 1 ? '0' : '1') + node.orderNo;
12566
+ }
12536
12567
  node.title = '名称:' + node.name + '\r\n代码:' + node.code + '\r\n排序:' + node.orderNo;
12537
12568
  }
12538
12569
  }
@@ -12578,17 +12609,17 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
12578
12609
  this.loadSysSetup(this.orgCode);
12579
12610
  },
12580
12611
  onTreeNodeClick: function onTreeNodeClick(evt, treeId, treeNode) {
12581
- var _this2 = this;
12612
+ var _this3 = this;
12582
12613
  // 菜单树点击事件
12583
12614
  var sysVo = JSON.parse(JSON.stringify(this.sys));
12584
12615
  this.sys = null;
12585
12616
  this.$nextTick(function (res) {
12586
12617
  if (treeNode.pId === undefined || treeNode.pId === null) {
12587
- _this2.menuItem = null;
12588
- _this2.sys = treeNode;
12618
+ _this3.menuItem = null;
12619
+ _this3.sys = treeNode;
12589
12620
  } else {
12590
- _this2.setMenuItem(treeNode);
12591
- _this2.sys = sysVo;
12621
+ _this3.setMenuItem(treeNode);
12622
+ _this3.sys = sysVo;
12592
12623
  }
12593
12624
  });
12594
12625
  },
@@ -12621,7 +12652,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
12621
12652
  }
12622
12653
  },
12623
12654
  treeDropNode: function treeDropNode(event, treeId, dropNode, targetNode, moveType, isCopy) {
12624
- var _this3 = this;
12655
+ var _this4 = this;
12625
12656
  var parentNode = null;
12626
12657
  var num = targetNode.orderNo;
12627
12658
  if (moveType === 'inner') {
@@ -12670,74 +12701,74 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
12670
12701
  url: this.moduleInfo.updateModuleUrl
12671
12702
  }).then(function (res) {
12672
12703
  if (res.code === 'success') {
12673
- _this3.onTreeNodeClick(event, treeId, dropNode);
12674
- _this3.$message.success(res.message);
12704
+ _this4.onTreeNodeClick(event, treeId, dropNode);
12705
+ _this4.$message.success(res.message);
12675
12706
  } else {
12676
- _this3.$alert(res.message, {
12707
+ _this4.$alert(res.message, {
12677
12708
  type: 'error'
12678
12709
  });
12679
12710
  }
12680
12711
  });
12681
12712
  },
12682
12713
  addModuleMenu: function addModuleMenu(treeId, contextNode) {
12683
- var _this4 = this;
12714
+ var _this5 = this;
12684
12715
  this.zTree.selectNode(contextNode);
12685
12716
  this.sys = contextNode;
12686
12717
  this.menuItem = null;
12687
12718
  this.$nextTick(function () {
12688
- _this4.$bus.emit('addModuleMenu');
12719
+ _this5.$bus.emit('addModuleMenu');
12689
12720
  });
12690
12721
  },
12691
12722
  editSysSetup: function editSysSetup(treeId, contextNode) {
12692
- var _this5 = this;
12723
+ var _this6 = this;
12693
12724
  this.zTree.selectNode(contextNode);
12694
12725
  this.sys = contextNode;
12695
12726
  this.menuItem = null;
12696
12727
  this.$nextTick(function () {
12697
- _this5.$bus.emit('editSysSetup');
12728
+ _this6.$bus.emit('editSysSetup');
12698
12729
  });
12699
12730
  },
12700
12731
  addMenu: function addMenu(treeId, contextNode) {
12701
- var _this6 = this;
12732
+ var _this7 = this;
12702
12733
  this.zTree.selectNode(contextNode);
12703
12734
  this.setMenuItem(contextNode);
12704
12735
  this.$nextTick(function () {
12705
- _this6.$bus.emit('addMenu');
12736
+ _this7.$bus.emit('addMenu');
12706
12737
  });
12707
12738
  },
12708
12739
  addWflowMenus: function addWflowMenus(treeId, contextNode) {
12709
- var _this7 = this;
12740
+ var _this8 = this;
12710
12741
  this.zTree.selectNode(contextNode);
12711
12742
  this.setMenuItem(contextNode);
12712
12743
  this.$nextTick(function () {
12713
- _this7.$bus.emit('addMenu', 'wflowMenus');
12744
+ _this8.$bus.emit('addMenu', 'wflowMenus');
12714
12745
  });
12715
12746
  },
12716
12747
  editMenu: function editMenu(treeId, contextNode) {
12717
- var _this8 = this;
12748
+ var _this9 = this;
12718
12749
  this.zTree.selectNode(contextNode);
12719
12750
  this.setMenuItem(contextNode);
12720
12751
  this.$nextTick(function () {
12721
- _this8.$bus.emit('editMenu');
12752
+ _this9.$bus.emit('editMenu');
12722
12753
  });
12723
12754
  },
12724
12755
  deleteMenu: function deleteMenu(treeId, contextNode) {
12725
- var _this9 = this;
12756
+ var _this10 = this;
12726
12757
  if (this.menuItem === null) {
12727
12758
  this.zTree.selectNode(contextNode);
12728
12759
  this.setMenuItem(contextNode);
12729
12760
  }
12730
12761
  this.$nextTick(function () {
12731
- _this9.$bus.emit('deleteMenu', contextNode);
12762
+ _this10.$bus.emit('deleteMenu', contextNode);
12732
12763
  });
12733
12764
  }
12734
12765
  }
12735
12766
  });
12736
12767
  ;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/index.vue?vue&type=script&lang=js
12737
12768
  /* harmony default export */ var Module_srcvue_type_script_lang_js = (srcvue_type_script_lang_js);
12738
- // EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/index.vue?vue&type=style&index=0&id=3801b56a&prod&scoped=true&lang=scss
12739
- var srcvue_type_style_index_0_id_3801b56a_prod_scoped_true_lang_scss = __webpack_require__(94511);
12740
- ;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/index.vue?vue&type=style&index=0&id=3801b56a&prod&scoped=true&lang=scss
12769
+ // EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Module/src/index.vue?vue&type=style&index=0&id=7411b67a&prod&scoped=true&lang=scss
12770
+ var srcvue_type_style_index_0_id_7411b67a_prod_scoped_true_lang_scss = __webpack_require__(89582);
12771
+ ;// CONCATENATED MODULE: ./packages/ecwplat/Module/src/index.vue?vue&type=style&index=0&id=7411b67a&prod&scoped=true&lang=scss
12741
12772
 
12742
12773
  // EXTERNAL MODULE: ./node_modules/@vue/vue-loader-v15/lib/runtime/componentNormalizer.js
12743
12774
  var componentNormalizer = __webpack_require__(81656);
@@ -12756,7 +12787,7 @@ var component = (0,componentNormalizer/* default */.A)(
12756
12787
  staticRenderFns,
12757
12788
  false,
12758
12789
  null,
12759
- "3801b56a",
12790
+ "7411b67a",
12760
12791
  null
12761
12792
 
12762
12793
  )
@@ -42892,7 +42923,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".bottombar[data-v-78fd1220]{position:a
42892
42923
 
42893
42924
  /***/ }),
42894
42925
 
42895
- /***/ 86635:
42926
+ /***/ 89874:
42896
42927
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
42897
42928
 
42898
42929
  "use strict";
@@ -42906,7 +42937,7 @@ __webpack_require__.r(__webpack_exports__);
42906
42937
 
42907
42938
  var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
42908
42939
  // Module
42909
- ___CSS_LOADER_EXPORT___.push([module.id, "[data-v-fe9b1a68] .todo-row .cell{line-height:18px}[data-v-fe9b1a68] .todo-row td{padding:5px 0}[data-v-fe9b1a68] .timeout-row .cell{color:red}.el-tab-pane[data-v-fe9b1a68]{height:550px;overflow-y:auto}[data-v-fe9b1a68] .col-time .cell{word-break:break-word}[data-v-fe9b1a68] .wfNodeLoglist-dialog .el-scrollbar{width:100%;height:100%}[data-v-fe9b1a68] .wfNodeLoglist-dialog .el-scrollbar .el-scrollbar__wrap{overflow-x:auto;height:calc(100% + 17px);padding-right:20px;padding-bottom:40px}[data-v-fe9b1a68] .wfNodeLoglist-dialog .el-dialog__body{padding-right:0;padding-bottom:0}[data-v-fe9b1a68] .wfNodeLoglist-dialog .el-dialog__body .handwritingIdea{width:100px}[data-v-fe9b1a68] .wfNodeLoglist-dialog .el-tabs__nav-wrap:after{width:calc(100% - 20px)}[data-v-fe9b1a68] .wfNodeLoglist-dialog .flow-node-logs .el-scrollbar__view,[data-v-fe9b1a68] .wfNodeLoglist-dialog .read-node-logs .el-scrollbar__view{height:100%}.height100[data-v-fe9b1a68]{height:calc(100vh - 120px)}[data-v-fe9b1a68] .el-dialog__headerbtn{top:18px}.form-wflog-container[data-v-fe9b1a68]{min-height:calc(100vh - 70px);min-width:1200px;background-color:#fff;padding:20px}.historyIdea-container[data-v-fe9b1a68]{z-index:2000;background-color:#fff;padding:10px 20px 20px 20px}.historyIdea-container[data-v-fe9b1a68] .el-tabs__content{display:none}.historyIdea-container[data-v-fe9b1a68] .el-tabs__nav-wrap:after{height:0}.historyIdea-container[data-v-fe9b1a68] .el-table .cell{white-space:inherit}.historyIdea-container .export-icon[data-v-fe9b1a68]{cursor:pointer;float:right;margin-top:-40px}.historyIdea-container .export-icon .svg-icon[data-v-fe9b1a68]{color:red;font-size:16px;margin-right:5px}.historyIdea-container .collapse-icon[data-v-fe9b1a68]{cursor:pointer;float:right;margin-top:-40px;margin-right:70px}.historyIdea-container .collapse-icon .svg-icon[data-v-fe9b1a68]{font-size:16px;margin-right:5px}", ""]);
42940
+ ___CSS_LOADER_EXPORT___.push([module.id, "[data-v-30ac694c] .todo-row .cell{line-height:18px}[data-v-30ac694c] .todo-row td{padding:5px 0}[data-v-30ac694c] .timeout-row .cell{color:red}.el-tab-pane[data-v-30ac694c]{height:550px;overflow-y:auto}[data-v-30ac694c] .col-time .cell{word-break:break-word}[data-v-30ac694c] .wfNodeLoglist-dialog .el-scrollbar{width:100%;height:100%}[data-v-30ac694c] .wfNodeLoglist-dialog .el-scrollbar .el-scrollbar__wrap{overflow-x:auto;height:calc(100% + 17px);padding-right:20px;padding-bottom:40px}[data-v-30ac694c] .wfNodeLoglist-dialog .el-dialog__body{padding-right:0;padding-bottom:0}[data-v-30ac694c] .wfNodeLoglist-dialog .el-dialog__body .handwritingIdea{width:100px}[data-v-30ac694c] .wfNodeLoglist-dialog .el-tabs__nav-wrap:after{width:calc(100% - 20px)}[data-v-30ac694c] .wfNodeLoglist-dialog .flow-node-logs .el-scrollbar__view,[data-v-30ac694c] .wfNodeLoglist-dialog .read-node-logs .el-scrollbar__view{height:100%}.height100[data-v-30ac694c]{height:calc(100vh - 120px)}[data-v-30ac694c] .el-dialog__headerbtn{top:18px}.form-wflog-container[data-v-30ac694c]{min-height:calc(100vh - 70px);min-width:1200px;background-color:#fff;padding:20px}.historyIdea-container[data-v-30ac694c]{z-index:2000;background-color:#fff;padding:10px 20px 20px 20px}.historyIdea-container[data-v-30ac694c] .el-tabs__content{display:none}.historyIdea-container[data-v-30ac694c] .el-tabs__nav-wrap:after{height:0}.historyIdea-container[data-v-30ac694c] .el-table .cell{white-space:inherit}.historyIdea-container .export-icon[data-v-30ac694c]{cursor:pointer;float:right;margin-top:-40px}.historyIdea-container .export-icon .svg-icon[data-v-30ac694c]{color:red;font-size:16px;margin-right:5px}.historyIdea-container .collapse-icon[data-v-30ac694c]{cursor:pointer;float:right;margin-top:-40px;margin-right:70px}.historyIdea-container .collapse-icon .svg-icon[data-v-30ac694c]{font-size:16px;margin-right:5px}", ""]);
42910
42941
  // Exports
42911
42942
  /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
42912
42943
 
@@ -43081,7 +43112,7 @@ ___CSS_LOADER_EXPORT___.push([module.id, ".icon-dialog[data-v-c28e28c6] .el-dial
43081
43112
 
43082
43113
  /***/ }),
43083
43114
 
43084
- /***/ 4749:
43115
+ /***/ 43176:
43085
43116
  /***/ (function(module, __webpack_exports__, __webpack_require__) {
43086
43117
 
43087
43118
  "use strict";
@@ -43095,7 +43126,7 @@ __webpack_require__.r(__webpack_exports__);
43095
43126
 
43096
43127
  var ___CSS_LOADER_EXPORT___ = _node_modules_css_loader_dist_runtime_api_js__WEBPACK_IMPORTED_MODULE_1___default()((_node_modules_css_loader_dist_runtime_noSourceMaps_js__WEBPACK_IMPORTED_MODULE_0___default()));
43097
43128
  // Module
43098
- ___CSS_LOADER_EXPORT___.push([module.id, ".dwadmin-initmessage[data-v-3801b56a]{text-align:center;font-size:13px;padding-top:50px}.panel-left[data-v-3801b56a] .el-input__inner{border-top:0;border-left:0;border-right:0}.el-switch[data-v-3801b56a]{margin:6px 12px}.can-merge-subsys[data-v-3801b56a]{border-top:1px solid #f3f3f3;height:calc(100% - 32px)}", ""]);
43129
+ ___CSS_LOADER_EXPORT___.push([module.id, ".dwadmin-initmessage[data-v-7411b67a]{text-align:center;font-size:13px;padding-top:50px}.panel-left[data-v-7411b67a] .el-input__inner{border-top:0;border-left:0;border-right:0}.el-switch[data-v-7411b67a]{margin:6px 12px}.can-merge-subsys[data-v-7411b67a]{border-top:1px solid #f3f3f3;height:calc(100% - 32px)}", ""]);
43099
43130
  // Exports
43100
43131
  /* harmony default export */ __webpack_exports__["default"] = (___CSS_LOADER_EXPORT___);
43101
43132
 
@@ -137167,19 +137198,19 @@ var update = add("43e5f5ea", content, true, {"sourceMap":false,"shadowMode":fals
137167
137198
 
137168
137199
  /***/ }),
137169
137200
 
137170
- /***/ 21605:
137201
+ /***/ 776:
137171
137202
  /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
137172
137203
 
137173
137204
  // style-loader: Adds some css to the DOM by adding a <style> tag
137174
137205
 
137175
137206
  // load the styles
137176
- var content = __webpack_require__(86635);
137207
+ var content = __webpack_require__(89874);
137177
137208
  if(content.__esModule) content = content.default;
137178
137209
  if(typeof content === 'string') content = [[module.id, content, '']];
137179
137210
  if(content.locals) module.exports = content.locals;
137180
137211
  // add the styles to the DOM
137181
137212
  var add = (__webpack_require__(99548)/* ["default"] */ .A)
137182
- var update = add("2c118fdb", content, true, {"sourceMap":false,"shadowMode":false});
137213
+ var update = add("641be4b8", content, true, {"sourceMap":false,"shadowMode":false});
137183
137214
 
137184
137215
  /***/ }),
137185
137216
 
@@ -137311,19 +137342,19 @@ var update = add("79025911", content, true, {"sourceMap":false,"shadowMode":fals
137311
137342
 
137312
137343
  /***/ }),
137313
137344
 
137314
- /***/ 94511:
137345
+ /***/ 89582:
137315
137346
  /***/ (function(module, __unused_webpack_exports, __webpack_require__) {
137316
137347
 
137317
137348
  // style-loader: Adds some css to the DOM by adding a <style> tag
137318
137349
 
137319
137350
  // load the styles
137320
- var content = __webpack_require__(4749);
137351
+ var content = __webpack_require__(43176);
137321
137352
  if(content.__esModule) content = content.default;
137322
137353
  if(typeof content === 'string') content = [[module.id, content, '']];
137323
137354
  if(content.locals) module.exports = content.locals;
137324
137355
  // add the styles to the DOM
137325
137356
  var add = (__webpack_require__(99548)/* ["default"] */ .A)
137326
- var update = add("ea684738", content, true, {"sourceMap":false,"shadowMode":false});
137357
+ var update = add("25b57d8d", content, true, {"sourceMap":false,"shadowMode":false});
137327
137358
 
137328
137359
  /***/ }),
137329
137360
 
@@ -178583,8 +178614,8 @@ var SubmitDialog_component = (0,componentNormalizer/* default */.A)(
178583
178614
  )
178584
178615
 
178585
178616
  /* harmony default export */ var SubmitDialog = (SubmitDialog_component.exports);
178586
- ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfNodelogList.vue?vue&type=template&id=fe9b1a68&scoped=true
178587
- var WfNodelogListvue_type_template_id_fe9b1a68_scoped_true_render = function render() {
178617
+ ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfNodelogList.vue?vue&type=template&id=30ac694c&scoped=true
178618
+ var WfNodelogListvue_type_template_id_30ac694c_scoped_true_render = function render() {
178588
178619
  var _vm = this,
178589
178620
  _c = _vm._self._c;
178590
178621
  return _c('div', {
@@ -179108,7 +179139,7 @@ var WfNodelogListvue_type_template_id_fe9b1a68_scoped_true_render = function ren
179108
179139
  attrs: {
179109
179140
  "label": _vm.$tx('ecwapp.Common.handlerDept', '处理人部门'),
179110
179141
  "prop": "staffOrgName",
179111
- "width": "120",
179142
+ "width": "180",
179112
179143
  "align": "center"
179113
179144
  }
179114
179145
  }) : _vm._e(), _vm.showSender === 1 ? _c('el-table-column', {
@@ -179263,7 +179294,7 @@ var WfNodelogListvue_type_template_id_fe9b1a68_scoped_true_render = function ren
179263
179294
  attrs: {
179264
179295
  "label": _vm.$tx('ecwapp.Wflowform.WfNodelogList.readingDepartment', '阅文人部门'),
179265
179296
  "prop": "staffOrgName",
179266
- "width": "120",
179297
+ "width": "180",
179267
179298
  "align": "center"
179268
179299
  }
179269
179300
  }), _vm.showSender === 1 ? _c('el-table-column', {
@@ -179377,7 +179408,7 @@ var WfNodelogListvue_type_template_id_fe9b1a68_scoped_true_render = function ren
179377
179408
  attrs: {
179378
179409
  "label": _vm.$tx('ecwapp.Common.handlerDept', '处理人部门'),
179379
179410
  "prop": "staffOrgName",
179380
- "width": "120",
179411
+ "width": "180",
179381
179412
  "align": "center"
179382
179413
  }
179383
179414
  }) : _vm._e(), _vm.showSender === 1 ? _c('el-table-column', {
@@ -179550,7 +179581,7 @@ var WfNodelogListvue_type_template_id_fe9b1a68_scoped_true_render = function ren
179550
179581
  attrs: {
179551
179582
  "label": _vm.$tx('ecwapp.Common.handlerDept', '处理人部门'),
179552
179583
  "prop": "staffOrgName",
179553
- "width": "120",
179584
+ "width": "180",
179554
179585
  "align": "center"
179555
179586
  }
179556
179587
  }), _vm.showSender === 1 ? _c('el-table-column', {
@@ -179651,7 +179682,7 @@ var WfNodelogListvue_type_template_id_fe9b1a68_scoped_true_render = function ren
179651
179682
  }], null, false, 1872946213)
179652
179683
  })], 1) : _vm._e()], 1)]) : _vm._e()])], 1);
179653
179684
  };
179654
- var WfNodelogListvue_type_template_id_fe9b1a68_scoped_true_staticRenderFns = [];
179685
+ var WfNodelogListvue_type_template_id_30ac694c_scoped_true_staticRenderFns = [];
179655
179686
 
179656
179687
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfNodelogList.vue?vue&type=script&lang=js
179657
179688
  function WfNodelogListvue_type_script_lang_js_typeof(o) { "@babel/helpers - typeof"; return WfNodelogListvue_type_script_lang_js_typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, WfNodelogListvue_type_script_lang_js_typeof(o); }
@@ -180481,9 +180512,9 @@ function WfNodelogListvue_type_script_lang_js_toPrimitive(t, r) { if ("object" !
180481
180512
  });
180482
180513
  ;// CONCATENATED MODULE: ./packages/ecwapp/Wflowform/src/WfNodelogList.vue?vue&type=script&lang=js
180483
180514
  /* harmony default export */ var src_WfNodelogListvue_type_script_lang_js = (WfNodelogListvue_type_script_lang_js);
180484
- // EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfNodelogList.vue?vue&type=style&index=0&id=fe9b1a68&prod&scoped=true&lang=scss
180485
- var WfNodelogListvue_type_style_index_0_id_fe9b1a68_prod_scoped_true_lang_scss = __webpack_require__(21605);
180486
- ;// CONCATENATED MODULE: ./packages/ecwapp/Wflowform/src/WfNodelogList.vue?vue&type=style&index=0&id=fe9b1a68&prod&scoped=true&lang=scss
180515
+ // EXTERNAL MODULE: ./node_modules/vue-style-loader/index.js??clonedRuleSet-22.use[0]!./node_modules/css-loader/dist/cjs.js??clonedRuleSet-22.use[1]!./node_modules/@vue/vue-loader-v15/lib/loaders/stylePostLoader.js!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[2]!./node_modules/postcss-loader/dist/cjs.js??clonedRuleSet-22.use[3]!./node_modules/sass-loader/dist/cjs.js??clonedRuleSet-22.use[4]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwapp/Wflowform/src/WfNodelogList.vue?vue&type=style&index=0&id=30ac694c&prod&scoped=true&lang=scss
180516
+ var WfNodelogListvue_type_style_index_0_id_30ac694c_prod_scoped_true_lang_scss = __webpack_require__(776);
180517
+ ;// CONCATENATED MODULE: ./packages/ecwapp/Wflowform/src/WfNodelogList.vue?vue&type=style&index=0&id=30ac694c&prod&scoped=true&lang=scss
180487
180518
 
180488
180519
  ;// CONCATENATED MODULE: ./packages/ecwapp/Wflowform/src/WfNodelogList.vue
180489
180520
 
@@ -180496,11 +180527,11 @@ var WfNodelogListvue_type_style_index_0_id_fe9b1a68_prod_scoped_true_lang_scss =
180496
180527
 
180497
180528
  var WfNodelogList_component = (0,componentNormalizer/* default */.A)(
180498
180529
  src_WfNodelogListvue_type_script_lang_js,
180499
- WfNodelogListvue_type_template_id_fe9b1a68_scoped_true_render,
180500
- WfNodelogListvue_type_template_id_fe9b1a68_scoped_true_staticRenderFns,
180530
+ WfNodelogListvue_type_template_id_30ac694c_scoped_true_render,
180531
+ WfNodelogListvue_type_template_id_30ac694c_scoped_true_staticRenderFns,
180501
180532
  false,
180502
180533
  null,
180503
- "fe9b1a68",
180534
+ "30ac694c",
180504
180535
  null
180505
180536
 
180506
180537
  )
@@ -194148,7 +194179,7 @@ var ResRoles_RoleMgr = RoleMgr;
194148
194179
  var ResRoles_UserPermissionSet = UserPermissionSet;
194149
194180
  var ResRoles_RolePermissionSet = RolePermissionSet;
194150
194181
  // EXTERNAL MODULE: ./packages/ecwplat/Module/index.js + 22 modules
194151
- var Module = __webpack_require__(79447);
194182
+ var Module = __webpack_require__(12317);
194152
194183
  ;// CONCATENATED MODULE: ./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[0]!./node_modules/@vue/vue-loader-v15/lib/loaders/templateLoader.js??ruleSet[1].rules[3]!./node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./packages/ecwplat/Organ/src/ImportPersonOrg.vue?vue&type=template&id=194b0447&scoped=true
194153
194184
  var ImportPersonOrgvue_type_template_id_194b0447_scoped_true_render = function render() {
194154
194185
  var _vm = this,