ydb-components-material 0.1.163 → 0.1.165

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

@@ -23,6 +23,14 @@ export default function CheckPoint(props) {
     setContainerHeight = _useState5[1];
   var imgRef = useRef();
   var containerRef = useRef();
+
+  // 获取 PDF 实际渲染宽度：以容器宽度为准，而非视口宽度。
+  // 移动端容器通常占满视口（clientWidth 等于视口宽），但 PC 端 CheckPoint 可能嵌在 Dialog 里
+  // （如 width=90vw），容器宽度小于视口，若按视口算缩放系数会整体偏大、标注点位错位
+  var getRenderWidth = function getRenderWidth() {
+    var container = containerRef.current;
+    return container && container.clientWidth ? container.clientWidth : document.documentElement.clientWidth;
+  };
   var initData = function initData() {
     var fileUrl = checkPointData.fileUrl,
       _checkPointData$annot = checkPointData.annotations,
@@ -36,11 +44,10 @@ export default function CheckPoint(props) {
     setResultData(annotations.sort(function (a, b) {
       return a.page - b.page;
     }));
-    var clientWidth = document.documentElement.clientWidth;
     var _annotations$ = annotations[0],
       scrollWidth = _annotations$.scrollWidth,
       scrollHeight = _annotations$.scrollHeight;
-    var scale = clientWidth / scrollWidth;
+    var scale = getRenderWidth() / scrollWidth;
     setPageHeight(scrollHeight * scale);
   };
 
@@ -56,11 +63,11 @@ export default function CheckPoint(props) {
     console.log(width, height, x, y);
     var img = imgRef.current;
     console.log(img, 'refs');
-    var clientWidth = document.documentElement.clientWidth;
-    console.log('clientWidth-----', clientWidth);
+    var renderWidth = getRenderWidth();
+    console.log('renderWidth-----', renderWidth);
 
     // 算出一个系数，来动态生成下面的边框样式
-    var scale = clientWidth / scrollWidth;
+    var scale = renderWidth / scrollWidth;
 
     // console.log('原始宽高', sourceImgWidth, sourceImgHeight);
     console.log('原始宽高', scrollWidth, scrollHeight);

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

@@ -577,9 +577,14 @@ var FileItem = function FileItem(_ref) {
     var safeSignatureAgentRole = signatureAgentRole !== null && signatureAgentRole !== void 0 ? signatureAgentRole : [];
     var safeSignSelfRole = signSelfRole !== null && signSelfRole !== void 0 ? signSelfRole : [];
     var safeSignAgentRole = signAgentRole !== null && signAgentRole !== void 0 ? signAgentRole : [];
-    var notNeedSelfSign = !safeSignatureSelfRole.includes(SELF) && !safeSignatureAgentRole.includes(SELF) && !safeSignSelfRole.includes(SELF) && !safeSignAgentRole.includes(SELF);
-    // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
-    if (notNeedSelfSign && needOtherSign) {
+    // 区分自办/代办场景：代办（signerInfo 非空）看 AgentRole，自办看 SelfRole
+    var isAgent = Object.keys(signerInfo).length > 0;
+    var safeSignatureRole = isAgent ? safeSignatureAgentRole : safeSignatureSelfRole;
+    var safeSignRole = isAgent ? safeSignAgentRole : safeSignSelfRole;
+    // 自己不需要签署、但需要别人签署时，直接打开维护签署人信息
+    var notNeedSelfSign = !safeSignatureRole.includes(SELF) && !safeSignRole.includes(SELF);
+    var needOtherSignInScenario = safeSignatureRole.includes(OTHER) || safeSignRole.includes(OTHER);
+    if (notNeedSelfSign && needOtherSignInScenario) {
       setShowSignerInfo(true);
       return;
     }

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

@@ -28,6 +28,14 @@ function CheckPoint(props) {
     setContainerHeight = _useState5[1];
   var imgRef = (0, _react.useRef)();
   var containerRef = (0, _react.useRef)();
+
+  // 获取 PDF 实际渲染宽度：以容器宽度为准，而非视口宽度。
+  // 移动端容器通常占满视口（clientWidth 等于视口宽），但 PC 端 CheckPoint 可能嵌在 Dialog 里
+  // （如 width=90vw），容器宽度小于视口，若按视口算缩放系数会整体偏大、标注点位错位
+  var getRenderWidth = function getRenderWidth() {
+    var container = containerRef.current;
+    return container && container.clientWidth ? container.clientWidth : document.documentElement.clientWidth;
+  };
   var initData = function initData() {
     var fileUrl = checkPointData.fileUrl,
       _checkPointData$annot = checkPointData.annotations,
@@ -41,11 +49,10 @@ function CheckPoint(props) {
     setResultData(annotations.sort(function (a, b) {
       return a.page - b.page;
     }));
-    var clientWidth = document.documentElement.clientWidth;
     var _annotations$ = annotations[0],
       scrollWidth = _annotations$.scrollWidth,
       scrollHeight = _annotations$.scrollHeight;
-    var scale = clientWidth / scrollWidth;
+    var scale = getRenderWidth() / scrollWidth;
     setPageHeight(scrollHeight * scale);
   };
 
@@ -61,11 +68,11 @@ function CheckPoint(props) {
     console.log(width, height, x, y);
     var img = imgRef.current;
     console.log(img, 'refs');
-    var clientWidth = document.documentElement.clientWidth;
-    console.log('clientWidth-----', clientWidth);
+    var renderWidth = getRenderWidth();
+    console.log('renderWidth-----', renderWidth);
 
     // 算出一个系数，来动态生成下面的边框样式
-    var scale = clientWidth / scrollWidth;
+    var scale = renderWidth / scrollWidth;
 
     // console.log('原始宽高', sourceImgWidth, sourceImgHeight);
     console.log('原始宽高', scrollWidth, scrollHeight);

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

@@ -583,9 +583,14 @@ var FileItem = function FileItem(_ref) {
     var safeSignatureAgentRole = signatureAgentRole !== null && signatureAgentRole !== void 0 ? signatureAgentRole : [];
     var safeSignSelfRole = signSelfRole !== null && signSelfRole !== void 0 ? signSelfRole : [];
     var safeSignAgentRole = signAgentRole !== null && signAgentRole !== void 0 ? signAgentRole : [];
-    var notNeedSelfSign = !safeSignatureSelfRole.includes(SELF) && !safeSignatureAgentRole.includes(SELF) && !safeSignSelfRole.includes(SELF) && !safeSignAgentRole.includes(SELF);
-    // 如果不需要自己签署 只需要别人签署 就直接打开维护签署人信息
-    if (notNeedSelfSign && needOtherSign) {
+    // 区分自办/代办场景：代办（signerInfo 非空）看 AgentRole，自办看 SelfRole
+    var isAgent = Object.keys(signerInfo).length > 0;
+    var safeSignatureRole = isAgent ? safeSignatureAgentRole : safeSignatureSelfRole;
+    var safeSignRole = isAgent ? safeSignAgentRole : safeSignSelfRole;
+    // 自己不需要签署、但需要别人签署时，直接打开维护签署人信息
+    var notNeedSelfSign = !safeSignatureRole.includes(SELF) && !safeSignRole.includes(SELF);
+    var needOtherSignInScenario = safeSignatureRole.includes(OTHER) || safeSignRole.includes(OTHER);
+    if (notNeedSelfSign && needOtherSignInScenario) {
       setShowSignerInfo(true);
       return;
     }

package/lowcode_es/meta.js

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

package/lowcode_lib/meta.js

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

package/package.json

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