ydb-components-material 0.1.131 → 0.1.133

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.
@@ -116,22 +116,24 @@ var FileItem = function FileItem(_ref) {
116
116
  // 大前提: signatureEnable 或签章能力开启
117
117
  // signerInfo 不为空 → 代办场景 → signatureAgentRole/signAgentRole 含 OTHER 则不展示
118
118
  // signerInfo 为空 → 本人场景 → signatureSelfRole/signSelfRole 含 OTHER 则不展示
119
- var _React$useState6 = React.useState(false),
119
+ var _React$useState6 = React.useState(true),
120
120
  showSignBtn = _React$useState6[0],
121
121
  setShowSignBtn = _React$useState6[1];
122
122
  React.useEffect(function () {
123
123
  var prerequisite = signatureEnable || userInfo.acctType === '20' && signEnable;
124
+ console.log('prerequisite', prerequisite);
124
125
  if (!prerequisite) {
125
126
  setShowSignBtn(false);
126
127
  return;
127
128
  }
128
- if (Object.keys(signerInfo).length) {
129
- // 代办场景
130
- setShowSignBtn(!((signatureAgentRole !== null && signatureAgentRole !== void 0 ? signatureAgentRole : []).includes(OTHER) || (signAgentRole !== null && signAgentRole !== void 0 ? signAgentRole : []).includes(OTHER)));
131
- } else {
132
- // 本人场景
133
- setShowSignBtn(!((signatureSelfRole !== null && signatureSelfRole !== void 0 ? signatureSelfRole : []).includes(OTHER) || (signSelfRole !== null && signSelfRole !== void 0 ? signSelfRole : []).includes(OTHER)));
134
- }
129
+ // if (Object.keys(signerInfo).length) {
130
+ // // 代办场景
131
+ // setShowSignBtn(!((signatureAgentRole ?? []).includes(OTHER) || (signAgentRole ?? []).includes(OTHER)));
132
+ // } else {
133
+ // console.log('signatureSelfRole---', signatureSelfRole)
134
+ // // 本人场景
135
+ // setShowSignBtn(!((signatureSelfRole ?? []).includes(OTHER) || (signSelfRole ?? []).includes(OTHER)));
136
+ // }
135
137
  }, [signatureEnable, signEnable, userInfo, signerInfo, signatureAgentRole, signAgentRole, signatureSelfRole, signSelfRole]);
136
138
  var _useState = useState(false),
137
139
  isShowMaterialLib = _useState[0],
@@ -478,12 +480,17 @@ var FileItem = function FileItem(_ref) {
478
480
  };
479
481
  }();
480
482
  var signAndSeal = function signAndSeal() {
481
- // const notNeedSelfSign = !signatureSelfRole.includes(SELF) && !signatureAgentRole.includes(SELF) && !signSelfRole.includes(SELF) && !signAgentRole.includes(SELF)
482
- // // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
483
- // if (notNeedSelfSign && needOtherSign) {
484
- // setShowSignerInfo(true)
485
- // return
486
- // }
483
+ // 当前是个人 不需要签批。需要签他人签署 就直接打开维护签署人信息
484
+ if (userInfo.acctType !== '20' && !signatureEnable && needOtherSign) {
485
+ setShowSignerInfo(true);
486
+ return;
487
+ }
488
+ var notNeedSelfSign = !signatureSelfRole.includes(SELF) && !signatureAgentRole.includes(SELF) && !signSelfRole.includes(SELF) && !signAgentRole.includes(SELF);
489
+ // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
490
+ if (notNeedSelfSign && needOtherSign) {
491
+ setShowSignerInfo(true);
492
+ return;
493
+ }
487
494
  // 如果不能签章就直接签批
488
495
  if (!(userInfo.acctType === '20' && signEnable)) {
489
496
  sign();
@@ -497,7 +504,7 @@ var FileItem = function FileItem(_ref) {
497
504
  console.log('val---', val);
498
505
  valChange(val, fileIndex, index, subIndex);
499
506
  invalidHandle();
500
- // needOtherSign && setShowSignerInfo(true)
507
+ needOtherSign && setShowSignerInfo(true);
501
508
  };
502
509
 
503
510
  // 获取签章结果
@@ -511,7 +518,7 @@ var FileItem = function FileItem(_ref) {
511
518
  } else {
512
519
  valChange(val, fileIndex, index, subIndex);
513
520
  invalidHandle();
514
- // needOtherSign && setShowSignerInfo(true)
521
+ needOtherSign && setShowSignerInfo(true);
515
522
  }
516
523
  };
517
524
  var queryFileLibs = function queryFileLibs() {
@@ -55,7 +55,7 @@ function SignerInfo(props) {
55
55
  };
56
56
  var next = /*#__PURE__*/function () {
57
57
  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
58
- var i, item, fields, _i, _fields, field, val, fileObj, saveRes;
58
+ var i, item, fields, _i, _fields, field, val, fileObj, saveRes, id, workNo;
59
59
  return _regeneratorRuntime.wrap(function (_context) {
60
60
  while (1) switch (_context.prev = _context.next) {
61
61
  case 0:
@@ -135,9 +135,10 @@ function SignerInfo(props) {
135
135
  case 6:
136
136
  saveRes = _context.sent;
137
137
  if (saveRes) {
138
- fileObj.signId = saveRes;
138
+ id = saveRes.id, workNo = saveRes.workNo;
139
+ fileObj.signId = id;
139
140
  valChange === null || valChange === void 0 ? void 0 : valChange(fileObj, fileIndex, fileItemIndex, subIndex);
140
- setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?draftNo=" + saveRes);
141
+ setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?id=" + id + "&draftNo=" + workNo);
141
142
  setShowQRcode(true);
142
143
  } else {
143
144
  _Message.warning('信息保存失败,请重试');
@@ -332,7 +333,7 @@ function SignerInfo(props) {
332
333
  placeholder: "\u8BF7\u8F93\u5165",
333
334
  value: item.signerCertificateSno,
334
335
  onChange: function onChange(val) {
335
- return handleFieldChange('signerCompany', val, index);
336
+ return handleFieldChange('signerCertificateSno', val, index);
336
337
  }
337
338
  })), /*#__PURE__*/React.createElement("div", {
338
339
  className: "signer-info-item-box",
@@ -122,22 +122,24 @@ var FileItem = function FileItem(_ref) {
122
122
  // 大前提: signatureEnable 或签章能力开启
123
123
  // signerInfo 不为空 → 代办场景 → signatureAgentRole/signAgentRole 含 OTHER 则不展示
124
124
  // signerInfo 为空 → 本人场景 → signatureSelfRole/signSelfRole 含 OTHER 则不展示
125
- var _React$useState6 = _react["default"].useState(false),
125
+ var _React$useState6 = _react["default"].useState(true),
126
126
  showSignBtn = _React$useState6[0],
127
127
  setShowSignBtn = _React$useState6[1];
128
128
  _react["default"].useEffect(function () {
129
129
  var prerequisite = signatureEnable || userInfo.acctType === '20' && signEnable;
130
+ console.log('prerequisite', prerequisite);
130
131
  if (!prerequisite) {
131
132
  setShowSignBtn(false);
132
133
  return;
133
134
  }
134
- if (Object.keys(signerInfo).length) {
135
- // 代办场景
136
- setShowSignBtn(!((signatureAgentRole !== null && signatureAgentRole !== void 0 ? signatureAgentRole : []).includes(OTHER) || (signAgentRole !== null && signAgentRole !== void 0 ? signAgentRole : []).includes(OTHER)));
137
- } else {
138
- // 本人场景
139
- setShowSignBtn(!((signatureSelfRole !== null && signatureSelfRole !== void 0 ? signatureSelfRole : []).includes(OTHER) || (signSelfRole !== null && signSelfRole !== void 0 ? signSelfRole : []).includes(OTHER)));
140
- }
135
+ // if (Object.keys(signerInfo).length) {
136
+ // // 代办场景
137
+ // setShowSignBtn(!((signatureAgentRole ?? []).includes(OTHER) || (signAgentRole ?? []).includes(OTHER)));
138
+ // } else {
139
+ // console.log('signatureSelfRole---', signatureSelfRole)
140
+ // // 本人场景
141
+ // setShowSignBtn(!((signatureSelfRole ?? []).includes(OTHER) || (signSelfRole ?? []).includes(OTHER)));
142
+ // }
141
143
  }, [signatureEnable, signEnable, userInfo, signerInfo, signatureAgentRole, signAgentRole, signatureSelfRole, signSelfRole]);
142
144
  var _useState = (0, _react.useState)(false),
143
145
  isShowMaterialLib = _useState[0],
@@ -484,12 +486,17 @@ var FileItem = function FileItem(_ref) {
484
486
  };
485
487
  }();
486
488
  var signAndSeal = function signAndSeal() {
487
- // const notNeedSelfSign = !signatureSelfRole.includes(SELF) && !signatureAgentRole.includes(SELF) && !signSelfRole.includes(SELF) && !signAgentRole.includes(SELF)
488
- // // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
489
- // if (notNeedSelfSign && needOtherSign) {
490
- // setShowSignerInfo(true)
491
- // return
492
- // }
489
+ // 当前是个人 不需要签批。需要签他人签署 就直接打开维护签署人信息
490
+ if (userInfo.acctType !== '20' && !signatureEnable && needOtherSign) {
491
+ setShowSignerInfo(true);
492
+ return;
493
+ }
494
+ var notNeedSelfSign = !signatureSelfRole.includes(SELF) && !signatureAgentRole.includes(SELF) && !signSelfRole.includes(SELF) && !signAgentRole.includes(SELF);
495
+ // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
496
+ if (notNeedSelfSign && needOtherSign) {
497
+ setShowSignerInfo(true);
498
+ return;
499
+ }
493
500
  // 如果不能签章就直接签批
494
501
  if (!(userInfo.acctType === '20' && signEnable)) {
495
502
  sign();
@@ -503,7 +510,7 @@ var FileItem = function FileItem(_ref) {
503
510
  console.log('val---', val);
504
511
  valChange(val, fileIndex, index, subIndex);
505
512
  invalidHandle();
506
- // needOtherSign && setShowSignerInfo(true)
513
+ needOtherSign && setShowSignerInfo(true);
507
514
  };
508
515
 
509
516
  // 获取签章结果
@@ -517,7 +524,7 @@ var FileItem = function FileItem(_ref) {
517
524
  } else {
518
525
  valChange(val, fileIndex, index, subIndex);
519
526
  invalidHandle();
520
- // needOtherSign && setShowSignerInfo(true)
527
+ needOtherSign && setShowSignerInfo(true);
521
528
  }
522
529
  };
523
530
  var queryFileLibs = function queryFileLibs() {
@@ -61,7 +61,7 @@ function SignerInfo(props) {
61
61
  };
62
62
  var next = /*#__PURE__*/function () {
63
63
  var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
64
- var i, item, fields, _i, _fields, field, val, fileObj, saveRes;
64
+ var i, item, fields, _i, _fields, field, val, fileObj, saveRes, id, workNo;
65
65
  return _regenerator["default"].wrap(function (_context) {
66
66
  while (1) switch (_context.prev = _context.next) {
67
67
  case 0:
@@ -141,9 +141,10 @@ function SignerInfo(props) {
141
141
  case 6:
142
142
  saveRes = _context.sent;
143
143
  if (saveRes) {
144
- fileObj.signId = saveRes;
144
+ id = saveRes.id, workNo = saveRes.workNo;
145
+ fileObj.signId = id;
145
146
  valChange === null || valChange === void 0 ? void 0 : valChange(fileObj, fileIndex, fileItemIndex, subIndex);
146
- setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?draftNo=" + saveRes);
147
+ setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?id=" + id + "&draftNo=" + workNo);
147
148
  setShowQRcode(true);
148
149
  } else {
149
150
  _message["default"].warning('信息保存失败,请重试');
@@ -338,7 +339,7 @@ function SignerInfo(props) {
338
339
  placeholder: "\u8BF7\u8F93\u5165",
339
340
  value: item.signerCertificateSno,
340
341
  onChange: function onChange(val) {
341
- return handleFieldChange('signerCompany', val, index);
342
+ return handleFieldChange('signerCertificateSno', val, index);
342
343
  }
343
344
  })), /*#__PURE__*/_react["default"].createElement("div", {
344
345
  className: "signer-info-item-box",
@@ -98,7 +98,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
98
98
  packageName = 'ydb-components-material';
99
99
  }
100
100
  if (version === void 0) {
101
- version = '0.1.131';
101
+ version = '0.1.133';
102
102
  }
103
103
  if (basicLibraryVersion === void 0) {
104
104
  basicLibraryVersion = {
@@ -103,7 +103,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
103
103
  packageName = 'ydb-components-material';
104
104
  }
105
105
  if (version === void 0) {
106
- version = '0.1.131';
106
+ version = '0.1.133';
107
107
  }
108
108
  if (basicLibraryVersion === void 0) {
109
109
  basicLibraryVersion = {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ydb-components-material",
3
- "version": "0.1.131",
3
+ "version": "0.1.133",
4
4
  "description": "ydb-components-material",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",
@@ -102,10 +102,10 @@
102
102
  },
103
103
  "componentConfig": {
104
104
  "isComponentLibrary": true,
105
- "materialSchema": "https://unpkg.com/ydb-components-material@0.1.131/build/lowcode/assets-prod.json"
105
+ "materialSchema": "https://unpkg.com/ydb-components-material@0.1.133/build/lowcode/assets-prod.json"
106
106
  },
107
107
  "lcMeta": {
108
108
  "type": "component"
109
109
  },
110
- "homepage": "https://unpkg.com/ydb-components-material@0.1.131/build/index.html"
110
+ "homepage": "https://unpkg.com/ydb-components-material@0.1.133/build/index.html"
111
111
  }