ydb-components-material 0.1.174 → 0.1.176

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.
@@ -31,6 +31,8 @@ var MATERIAL_FORMAT = {
31
31
  15: 'mp4',
32
32
  16: 'xml'
33
33
  };
34
+ var OTHER = 1; // 角色数组中"他人"对应的值
35
+
34
36
  var FileList = function FileList(_ref) {
35
37
  var fileList = _ref.fileList,
36
38
  token = _ref.token,
@@ -107,19 +107,20 @@ var FileItem = function FileItem(_ref) {
107
107
  var safeSignatureAgentRole = signatureAgentRole !== null && signatureAgentRole !== void 0 ? signatureAgentRole : [];
108
108
  var safeSignSelfRole = signSelfRole !== null && signSelfRole !== void 0 ? signSelfRole : [];
109
109
  var safeSignAgentRole = signAgentRole !== null && signAgentRole !== void 0 ? signAgentRole : [];
110
- var otherSign = safeSignatureSelfRole.includes(OTHER) || safeSignatureAgentRole.includes(OTHER) || safeSignSelfRole.includes(OTHER) || safeSignAgentRole.includes(OTHER);
111
- var otherSignature = safeSignatureSelfRole.includes(OTHER) || safeSignatureAgentRole.includes(OTHER);
112
- var otherSeal = safeSignSelfRole.includes(OTHER) || safeSignAgentRole.includes(OTHER);
110
+ // 区分自办/代办场景:signerInfo 有值即为代办,看 AgentRole;否则为本人,看 SelfRole
111
+ var isAgent = Object.keys(signerInfo).length > 0;
112
+ var safeSignatureRole = isAgent ? safeSignatureAgentRole : safeSignatureSelfRole;
113
+ var safeSignRole = isAgent ? safeSignAgentRole : safeSignSelfRole;
114
+ var otherSign = safeSignatureRole.includes(OTHER) || safeSignRole.includes(OTHER);
115
+ var otherSignature = safeSignatureRole.includes(OTHER);
116
+ var otherSeal = safeSignRole.includes(OTHER);
113
117
  setNeedOtherSign(otherSign);
114
118
  needOtherSignRef.current = otherSign;
115
119
  setIsNeedOtherSign(otherSignature);
116
120
  setIsNeedOtherSeal(otherSeal);
117
- // 按钮文字按 signerInfo 区分场景:
118
- // 代办 → signatureAgentRole/signAgentRole 含 OTHER
119
- // 本人 → signatureSelfRole/signSelfRole 含 OTHER
120
- var signBtnOtherSign = Object.keys(signerInfo).length ? safeSignatureAgentRole.includes(OTHER) || safeSignAgentRole.includes(OTHER) : safeSignatureSelfRole.includes(OTHER) || safeSignSelfRole.includes(OTHER);
121
- setSignBtnText(signBtnOtherSign ? '联合签署' : '签署文件');
122
- setReSignBtnText(signBtnOtherSign ? '重新签署' : '重新签署');
121
+ // 按钮文字:本场景下需要他人签署即为"联合签署"
122
+ setSignBtnText(otherSign ? '联合签署' : '签署文件');
123
+ setReSignBtnText(otherSign ? '重新签署' : '重新签署');
123
124
  }, [signatureSelfRole, signatureAgentRole, signSelfRole, signAgentRole, signerInfo]);
124
125
 
125
126
  // 是否展示签署按钮
@@ -980,7 +981,7 @@ var FileItem = function FileItem(_ref) {
980
981
  // 成功时 getSignedFile 内部会清除轮询并关闭 loading
981
982
  if (!success) {
982
983
  pollCount += 1;
983
- if (pollCount >= 10) {
984
+ if (pollCount >= 20) {
984
985
  clearInterval(timerRef.current);
985
986
  timerRef.current = null;
986
987
  closeLoading();
@@ -146,7 +146,7 @@ function SignerInfo(props) {
146
146
  fileObj.signId = id;
147
147
  valChange === null || valChange === void 0 ? void 0 : valChange(fileObj, fileIndex, fileItemIndex, subIndex);
148
148
  setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?id=" + id + "&draftNo=" + workNo + "&taskHandleItem=" + taskHandleItem);
149
- setUrlStr((env && env.indexOf('release') > -1 ? 'http://221.204.12.137:11000/mh/pages/sign/threeSign' : 'https://zwfw.xzspglj.taiyuan.gov.cn/threeSign') + "?id=" + id + "&draftNo=" + workNo + "&taskHandleItem=" + taskHandleItem);
149
+ setUrlStr((env && env.indexOf('release') > -1 ? 'http://221.204.12.137:11000/mh/pages/sign/threeSign' : 'https://zwfw.xzspglj.taiyuan.gov.cn/mh/pages/sign/threeSign') + "?id=" + id + "&draftNo=" + workNo + "&taskHandleItem=" + taskHandleItem);
150
150
  setShowQRcode(true);
151
151
  } else {
152
152
  _Message.warning('信息保存失败,请重试');
@@ -37,6 +37,8 @@ var MATERIAL_FORMAT = {
37
37
  15: 'mp4',
38
38
  16: 'xml'
39
39
  };
40
+ var OTHER = 1; // 角色数组中"他人"对应的值
41
+
40
42
  var FileList = function FileList(_ref) {
41
43
  var fileList = _ref.fileList,
42
44
  token = _ref.token,
@@ -113,19 +113,20 @@ var FileItem = function FileItem(_ref) {
113
113
  var safeSignatureAgentRole = signatureAgentRole !== null && signatureAgentRole !== void 0 ? signatureAgentRole : [];
114
114
  var safeSignSelfRole = signSelfRole !== null && signSelfRole !== void 0 ? signSelfRole : [];
115
115
  var safeSignAgentRole = signAgentRole !== null && signAgentRole !== void 0 ? signAgentRole : [];
116
- var otherSign = safeSignatureSelfRole.includes(OTHER) || safeSignatureAgentRole.includes(OTHER) || safeSignSelfRole.includes(OTHER) || safeSignAgentRole.includes(OTHER);
117
- var otherSignature = safeSignatureSelfRole.includes(OTHER) || safeSignatureAgentRole.includes(OTHER);
118
- var otherSeal = safeSignSelfRole.includes(OTHER) || safeSignAgentRole.includes(OTHER);
116
+ // 区分自办/代办场景:signerInfo 有值即为代办,看 AgentRole;否则为本人,看 SelfRole
117
+ var isAgent = Object.keys(signerInfo).length > 0;
118
+ var safeSignatureRole = isAgent ? safeSignatureAgentRole : safeSignatureSelfRole;
119
+ var safeSignRole = isAgent ? safeSignAgentRole : safeSignSelfRole;
120
+ var otherSign = safeSignatureRole.includes(OTHER) || safeSignRole.includes(OTHER);
121
+ var otherSignature = safeSignatureRole.includes(OTHER);
122
+ var otherSeal = safeSignRole.includes(OTHER);
119
123
  setNeedOtherSign(otherSign);
120
124
  needOtherSignRef.current = otherSign;
121
125
  setIsNeedOtherSign(otherSignature);
122
126
  setIsNeedOtherSeal(otherSeal);
123
- // 按钮文字按 signerInfo 区分场景:
124
- // 代办 → signatureAgentRole/signAgentRole 含 OTHER
125
- // 本人 → signatureSelfRole/signSelfRole 含 OTHER
126
- var signBtnOtherSign = Object.keys(signerInfo).length ? safeSignatureAgentRole.includes(OTHER) || safeSignAgentRole.includes(OTHER) : safeSignatureSelfRole.includes(OTHER) || safeSignSelfRole.includes(OTHER);
127
- setSignBtnText(signBtnOtherSign ? '联合签署' : '签署文件');
128
- setReSignBtnText(signBtnOtherSign ? '重新签署' : '重新签署');
127
+ // 按钮文字:本场景下需要他人签署即为"联合签署"
128
+ setSignBtnText(otherSign ? '联合签署' : '签署文件');
129
+ setReSignBtnText(otherSign ? '重新签署' : '重新签署');
129
130
  }, [signatureSelfRole, signatureAgentRole, signSelfRole, signAgentRole, signerInfo]);
130
131
 
131
132
  // 是否展示签署按钮
@@ -986,7 +987,7 @@ var FileItem = function FileItem(_ref) {
986
987
  // 成功时 getSignedFile 内部会清除轮询并关闭 loading
987
988
  if (!success) {
988
989
  pollCount += 1;
989
- if (pollCount >= 10) {
990
+ if (pollCount >= 20) {
990
991
  clearInterval(timerRef.current);
991
992
  timerRef.current = null;
992
993
  closeLoading();
@@ -152,7 +152,7 @@ function SignerInfo(props) {
152
152
  fileObj.signId = id;
153
153
  valChange === null || valChange === void 0 ? void 0 : valChange(fileObj, fileIndex, fileItemIndex, subIndex);
154
154
  setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?id=" + id + "&draftNo=" + workNo + "&taskHandleItem=" + taskHandleItem);
155
- setUrlStr((env && env.indexOf('release') > -1 ? 'http://221.204.12.137:11000/mh/pages/sign/threeSign' : 'https://zwfw.xzspglj.taiyuan.gov.cn/threeSign') + "?id=" + id + "&draftNo=" + workNo + "&taskHandleItem=" + taskHandleItem);
155
+ setUrlStr((env && env.indexOf('release') > -1 ? 'http://221.204.12.137:11000/mh/pages/sign/threeSign' : 'https://zwfw.xzspglj.taiyuan.gov.cn/mh/pages/sign/threeSign') + "?id=" + id + "&draftNo=" + workNo + "&taskHandleItem=" + taskHandleItem);
156
156
  setShowQRcode(true);
157
157
  } else {
158
158
  _message["default"].warning('信息保存失败,请重试');
@@ -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.174';
101
+ version = '0.1.176';
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.174';
106
+ version = '0.1.176';
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.174",
3
+ "version": "0.1.176",
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.174/build/lowcode/assets-prod.json"
105
+ "materialSchema": "https://unpkg.com/ydb-components-material@0.1.176/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.174/build/index.html"
110
+ "homepage": "https://unpkg.com/ydb-components-material@0.1.176/build/index.html"
111
111
  }