ydb-components-material 0.1.110 → 0.1.111

package/es/components/file-list/item.js

@@ -23,6 +23,8 @@ import CheckPoint from "./checkPoint";
 import SignerInfo from "./signerInfo";
 import "./item.scss";
 var RadioGroup = _Radio.Group;
+var SELF = 0;
+var OTHER = 1;
 var FileItem = function FileItem(_ref) {
   var index = _ref.index,
     subIndex = _ref.subIndex,
@@ -60,7 +62,16 @@ var FileItem = function FileItem(_ref) {
     keyPoint = fileConfig.keyPoint,
     isSmart = fileConfig.isSmart,
     isShareFile = fileConfig.isShareFile,
-    needOtherSign = fileConfig.needOtherSign;
+    signatureSelfRole = fileConfig.signatureSelfRole,
+    signatureAgentRole = fileConfig.signatureAgentRole,
+    signSelfRole = fileConfig.signSelfRole,
+    signAgentRole = fileConfig.signAgentRole;
+  // 需要他人签批或签章
+  var needOtherSign = signatureSelfRole.includes(OTHER) || signatureAgentRole.includes(OTHER) || signSelfRole.includes(OTHER) || signAgentRole.includes(OTHER);
+  // 需要他人签名
+  var isNeedOtherSign = signatureSelfRole.includes(OTHER) || signatureAgentRole.includes(OTHER);
+  // 需要他人签章
+  var isNeedOtherSeal = signSelfRole.includes(OTHER) || signAgentRole.includes(OTHER);
   var signBtnText = needOtherSign ? '联合签署' : '签署文件';
   var reSignBtnText = needOtherSign ? '重新联合签署' : '重新签署';
   var _useState = useState(false),
@@ -303,7 +314,6 @@ var FileItem = function FileItem(_ref) {
 
   // 签章
   var seal = function seal() {
-    console.log('fileType', fileType);
     var type = getFileExtension(fileName);
     if (type !== 'pdf') {
       _Message.notice('只有pdf文件才能使用电子签章');
@@ -313,6 +323,12 @@ var FileItem = function FileItem(_ref) {
     setIsShowSealPage(true);
   };
   var signAndSeal = function signAndSeal() {
+    // const notNeedSelfSign = !signatureSelfRole.includes(SELF) && !signatureAgentRole.includes(SELF) && !signSelfRole.includes(SELF) && !signAgentRole.includes(SELF)
+    // // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
+    // if (notNeedSelfSign && needOtherSign) {
+    //   setShowSignerInfo(true)
+    //   return
+    // }
     // 如果不能签章就直接签批
     if (!(userInfo.acctType === '20' && signEnable)) {
       sign();
@@ -728,13 +744,7 @@ var FileItem = function FileItem(_ref) {
   }, signatureEnable || userInfo.acctType === '20' && signEnable && /*#__PURE__*/React.createElement("div", {
     className: "operation_btn",
     onClick: signAndSeal
-  }, isSigned && isSealed ? reSignBtnText : signBtnText), !(userInfo.acctType === '20' && signEnable) && signatureEnable && /*#__PURE__*/React.createElement("div", {
-    className: "operation_btn",
-    onClick: sign
-  }, isSigned ? reSignBtnText : signBtnText), !signatureEnable && userInfo.acctType === '20' && signEnable && /*#__PURE__*/React.createElement("div", {
-    className: "operation_btn",
-    onClick: seal
-  }, isSealed ? reSignBtnText : signBtnText)) :
+  }, isSigned && isSealed ? reSignBtnText : signBtnText)) :
   // 展示材料库
   !isShareFile && !isSmart && !disabled && !!materialLib.length && /*#__PURE__*/React.createElement("div", {
     className: "operation_btn",
@@ -885,12 +895,13 @@ var FileItem = function FileItem(_ref) {
   }), showSignerInfo && /*#__PURE__*/React.createElement(SignerInfo, {
     signerInfo: signerInfo,
     handleClose: function handleClose() {
-      console.log('close');
-      setShowSignerInfo(false);
+      return setShowSignerInfo(false);
     },
     saveSignerInfo: saveSignerInfo,
     signatureEnable: signatureEnable,
-    signEnable: signEnable
+    signEnable: signEnable,
+    isNeedOtherSign: isNeedOtherSign,
+    isNeedOtherSeal: isNeedOtherSeal
   }));
 };
 FileItem.displayName = 'FileItem';

package/es/components/file-list/signerInfo.js

@@ -16,7 +16,9 @@ function SignerInfo(props) {
     signerInfo = props.signerInfo,
     saveSignerInfo = props.saveSignerInfo,
     signatureEnable = props.signatureEnable,
-    signEnable = props.signEnable;
+    signEnable = props.signEnable,
+    isNeedOtherSign = props.isNeedOtherSign,
+    isNeedOtherSeal = props.isNeedOtherSeal;
   var _React$useState = React.useState([]),
     signerInfoList = _React$useState[0],
     setSignerInfoList = _React$useState[1];
@@ -234,10 +236,10 @@ function SignerInfo(props) {
         return handleFieldChange('signContent', val, index);
       },
       "aria-labelledby": "groupId"
-    }, signatureEnable && /*#__PURE__*/React.createElement(_Checkbox, {
+    }, signatureEnable && isNeedOtherSign && /*#__PURE__*/React.createElement(_Checkbox, {
       id: "1",
       value: "1"
-    }, "\u4EC5\u7B7E\u540D"), signEnable && item.signType === 1 && /*#__PURE__*/React.createElement(_Checkbox, {
+    }, "\u4EC5\u7B7E\u540D"), signEnable && isNeedOtherSeal && item.signType === 1 && /*#__PURE__*/React.createElement(_Checkbox, {
       id: "2",
       value: "2"
     }, "\u4EC5\u7B7E\u7AE0")))));

package/es/components/guide/compoents/materials/situation.js

@@ -29,7 +29,7 @@ var Situation = function Situation(_ref) {
     return function () {
       window.removeEventListener('message', getMessage);
     };
-  }, []);
+  }, [eventInfoProp, taskHandleItemProp, situationPageUrlProp, declarationAppTokenProp, finalMaterialsProp, applicationIdProp, accessTokenProp, acctTypeProp]);
   var initPage = function initPage() {
     if (!situationPageUrlProp) return;
     var url = situationPageUrlProp + "&isFirst=1&isReCheck=1";

package/lib/components/file-list/item.js

@@ -29,6 +29,8 @@ var _signerInfo = _interopRequireDefault(require("./signerInfo"));
 require("./item.scss");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, "default": e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 var RadioGroup = _radio["default"].Group;
+var SELF = 0;
+var OTHER = 1;
 var FileItem = function FileItem(_ref) {
   var index = _ref.index,
     subIndex = _ref.subIndex,
@@ -66,7 +68,16 @@ var FileItem = function FileItem(_ref) {
     keyPoint = fileConfig.keyPoint,
     isSmart = fileConfig.isSmart,
     isShareFile = fileConfig.isShareFile,
-    needOtherSign = fileConfig.needOtherSign;
+    signatureSelfRole = fileConfig.signatureSelfRole,
+    signatureAgentRole = fileConfig.signatureAgentRole,
+    signSelfRole = fileConfig.signSelfRole,
+    signAgentRole = fileConfig.signAgentRole;
+  // 需要他人签批或签章
+  var needOtherSign = signatureSelfRole.includes(OTHER) || signatureAgentRole.includes(OTHER) || signSelfRole.includes(OTHER) || signAgentRole.includes(OTHER);
+  // 需要他人签名
+  var isNeedOtherSign = signatureSelfRole.includes(OTHER) || signatureAgentRole.includes(OTHER);
+  // 需要他人签章
+  var isNeedOtherSeal = signSelfRole.includes(OTHER) || signAgentRole.includes(OTHER);
   var signBtnText = needOtherSign ? '联合签署' : '签署文件';
   var reSignBtnText = needOtherSign ? '重新联合签署' : '重新签署';
   var _useState = (0, _react.useState)(false),
@@ -309,7 +320,6 @@ var FileItem = function FileItem(_ref) {
 
   // 签章
   var seal = function seal() {
-    console.log('fileType', fileType);
     var type = (0, _file2.getFileExtension)(fileName);
     if (type !== 'pdf') {
       _message["default"].notice('只有pdf文件才能使用电子签章');
@@ -319,6 +329,12 @@ var FileItem = function FileItem(_ref) {
     setIsShowSealPage(true);
   };
   var signAndSeal = function signAndSeal() {
+    // const notNeedSelfSign = !signatureSelfRole.includes(SELF) && !signatureAgentRole.includes(SELF) && !signSelfRole.includes(SELF) && !signAgentRole.includes(SELF)
+    // // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
+    // if (notNeedSelfSign && needOtherSign) {
+    //   setShowSignerInfo(true)
+    //   return
+    // }
     // 如果不能签章就直接签批
     if (!(userInfo.acctType === '20' && signEnable)) {
       sign();
@@ -734,13 +750,7 @@ var FileItem = function FileItem(_ref) {
   }, signatureEnable || userInfo.acctType === '20' && signEnable && /*#__PURE__*/_react["default"].createElement("div", {
     className: "operation_btn",
     onClick: signAndSeal
-  }, isSigned && isSealed ? reSignBtnText : signBtnText), !(userInfo.acctType === '20' && signEnable) && signatureEnable && /*#__PURE__*/_react["default"].createElement("div", {
-    className: "operation_btn",
-    onClick: sign
-  }, isSigned ? reSignBtnText : signBtnText), !signatureEnable && userInfo.acctType === '20' && signEnable && /*#__PURE__*/_react["default"].createElement("div", {
-    className: "operation_btn",
-    onClick: seal
-  }, isSealed ? reSignBtnText : signBtnText)) :
+  }, isSigned && isSealed ? reSignBtnText : signBtnText)) :
   // 展示材料库
   !isShareFile && !isSmart && !disabled && !!materialLib.length && /*#__PURE__*/_react["default"].createElement("div", {
     className: "operation_btn",
@@ -891,12 +901,13 @@ var FileItem = function FileItem(_ref) {
   }), showSignerInfo && /*#__PURE__*/_react["default"].createElement(_signerInfo["default"], {
     signerInfo: signerInfo,
     handleClose: function handleClose() {
-      console.log('close');
-      setShowSignerInfo(false);
+      return setShowSignerInfo(false);
     },
     saveSignerInfo: saveSignerInfo,
     signatureEnable: signatureEnable,
-    signEnable: signEnable
+    signEnable: signEnable,
+    isNeedOtherSign: isNeedOtherSign,
+    isNeedOtherSeal: isNeedOtherSeal
   }));
 };
 FileItem.displayName = 'FileItem';

package/lib/components/file-list/signerInfo.js

@@ -22,7 +22,9 @@ function SignerInfo(props) {
     signerInfo = props.signerInfo,
     saveSignerInfo = props.saveSignerInfo,
     signatureEnable = props.signatureEnable,
-    signEnable = props.signEnable;
+    signEnable = props.signEnable,
+    isNeedOtherSign = props.isNeedOtherSign,
+    isNeedOtherSeal = props.isNeedOtherSeal;
   var _React$useState = _react["default"].useState([]),
     signerInfoList = _React$useState[0],
     setSignerInfoList = _React$useState[1];
@@ -240,10 +242,10 @@ function SignerInfo(props) {
         return handleFieldChange('signContent', val, index);
       },
       "aria-labelledby": "groupId"
-    }, signatureEnable && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+    }, signatureEnable && isNeedOtherSign && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
       id: "1",
       value: "1"
-    }, "\u4EC5\u7B7E\u540D"), signEnable && item.signType === 1 && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+    }, "\u4EC5\u7B7E\u540D"), signEnable && isNeedOtherSeal && item.signType === 1 && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
       id: "2",
       value: "2"
     }, "\u4EC5\u7B7E\u7AE0")))));

package/lib/components/guide/compoents/materials/situation.js

@@ -33,7 +33,7 @@ var Situation = function Situation(_ref) {
     return function () {
       window.removeEventListener('message', getMessage);
     };
-  }, []);
+  }, [eventInfoProp, taskHandleItemProp, situationPageUrlProp, declarationAppTokenProp, finalMaterialsProp, applicationIdProp, accessTokenProp, acctTypeProp]);
   var initPage = function initPage() {
     if (!situationPageUrlProp) return;
     var url = situationPageUrlProp + "&isFirst=1&isReCheck=1";

package/lowcode_es/meta.js

@@ -97,7 +97,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = 'ydb-components-material';
   }
   if (version === void 0) {
-    version = '0.1.110';
+    version = '0.1.111';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_lib/meta.js

@@ -102,7 +102,7 @@ function fillRealVersion(meta, packageName, version, basicLibraryVersion) {
     packageName = 'ydb-components-material';
   }
   if (version === void 0) {
-    version = '0.1.110';
+    version = '0.1.111';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ydb-components-material",
-  "version": "0.1.110",
+  "version": "0.1.111",
   "description": "ydb-components-material",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -101,10 +101,10 @@
   },
   "componentConfig": {
     "isComponentLibrary": true,
-    "materialSchema": "https://unpkg.com/ydb-components-material@0.1.110/build/lowcode/assets-prod.json"
+    "materialSchema": "https://unpkg.com/ydb-components-material@0.1.111/build/lowcode/assets-prod.json"
   },
   "lcMeta": {
     "type": "component"
   },
-  "homepage": "https://unpkg.com/ydb-components-material@0.1.110/build/index.html"
+  "homepage": "https://unpkg.com/ydb-components-material@0.1.111/build/index.html"
 }