ydb-components-material 0.1.109 → 0.1.110

package/es/components/file-list/index.d.ts

@@ -5,7 +5,7 @@ export interface FileListProps {
      * 列表数据
      */
     fileList: Array<object>;
-    signerInfo: object;
+    signerInfo?: object;
     token: string;
     tokenTY: string;
     accessToken: string;

package/es/components/file-list/item.d.ts

@@ -18,7 +18,7 @@ export interface FileItemProps {
     isInValid: boolean;
     userInfo: object;
     style?: object;
-    signerInfo: object;
+    signerInfo?: object;
     openLoading: () => void;
     closeLoading: () => void;
     valChange: (value: any, fileIndex: any, index: any, subIndex: any) => void;

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

@@ -888,7 +888,9 @@ var FileItem = function FileItem(_ref) {
       console.log('close');
       setShowSignerInfo(false);
     },
-    saveSignerInfo: saveSignerInfo
+    saveSignerInfo: saveSignerInfo,
+    signatureEnable: signatureEnable,
+    signEnable: signEnable
   }));
 };
 FileItem.displayName = 'FileItem';

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

@@ -14,7 +14,9 @@ var RadioGroup = _Radio.Group;
 function SignerInfo(props) {
   var handleClose = props.handleClose,
     signerInfo = props.signerInfo,
-    saveSignerInfo = props.saveSignerInfo;
+    saveSignerInfo = props.saveSignerInfo,
+    signatureEnable = props.signatureEnable,
+    signEnable = props.signEnable;
   var _React$useState = React.useState([]),
     signerInfoList = _React$useState[0],
     setSignerInfoList = _React$useState[1];
@@ -22,7 +24,7 @@ function SignerInfo(props) {
     showQRcode = _useState[0],
     setShowQRcode = _useState[1];
   var canvasRef = useRef(null);
-  var _useState2 = useState('123123'),
+  var _useState2 = useState(''),
     url = _useState2[0],
     setUrl = _useState2[1];
   var handleFieldChange = function handleFieldChange(field, val, index) {
@@ -42,7 +44,7 @@ function SignerInfo(props) {
           case 1:
             saveRes = _context.sent;
             if (saveRes) {
-              setUrl('12312312');
+              setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?draftNo=" + saveRes);
               setShowQRcode(true);
             } else {
               _Message.warning('信息保存失败，请重试');
@@ -71,15 +73,31 @@ function SignerInfo(props) {
   };
   useEffect(function () {
     if (signerInfo) {
-      setSignerInfoList([signerInfo]);
+      console.log('signerInfo', signerInfo);
+      var corpName = signerInfo.corpName,
+        certificateSno = signerInfo.certificateSno,
+        legalMobile = signerInfo.legalMobile;
+      setSignerInfoList([{
+        signType: 1,
+        signerCompany: corpName,
+        signerCertificateSno: certificateSno,
+        signerPhoneNum: legalMobile
+      }]);
+    } else {
+      setSignerInfoList([{
+        signType: 0,
+        signerName: '',
+        signerCompany: '',
+        signContent: ''
+      }]);
     }
   }, [signerInfo]);
   useEffect(function () {
     if (canvasRef.current) {
       var options = {
-        width: 250,
+        width: 110,
         // 二维码的宽度
-        height: 250,
+        height: 110,
         // 二维码的高度
         color: {
           dark: '#000000',
@@ -197,7 +215,7 @@ function SignerInfo(props) {
     }, "*")), /*#__PURE__*/React.createElement(_Input, {
       className: "signer-info-input",
       placeholder: "\u8BF7\u8F93\u5165",
-      value: item.signerCompany,
+      value: item.signerCertificateSno,
       onChange: function onChange(val) {
         return handleFieldChange('signerCompany', val, index);
       }
@@ -216,16 +234,13 @@ function SignerInfo(props) {
         return handleFieldChange('signContent', val, index);
       },
       "aria-labelledby": "groupId"
-    }, /*#__PURE__*/React.createElement(_Checkbox, {
+    }, signatureEnable && /*#__PURE__*/React.createElement(_Checkbox, {
       id: "1",
       value: "1"
-    }, "\u4EC5\u7B7E\u540D"), /*#__PURE__*/React.createElement(_Checkbox, {
+    }, "\u4EC5\u7B7E\u540D"), signEnable && item.signType === 1 && /*#__PURE__*/React.createElement(_Checkbox, {
       id: "2",
       value: "2"
-    }, "\u4EC5\u7B7E\u7AE0"), /*#__PURE__*/React.createElement(_Checkbox, {
-      id: "3",
-      value: "3"
-    }, "\u7B7E\u540D\u548C\u7B7E\u7AE0")))));
+    }, "\u4EC5\u7B7E\u7AE0")))));
   })), /*#__PURE__*/React.createElement("div", {
     className: "footer"
   }, /*#__PURE__*/React.createElement("div", {
@@ -247,7 +262,9 @@ function SignerInfo(props) {
   }), /*#__PURE__*/React.createElement("canvas", {
     className: "qrcode-canvas",
     ref: canvasRef
-  }), /*#__PURE__*/React.createElement("p", null, "\u7B7E\u7F72\u4E8C\u7EF4\u7801"), /*#__PURE__*/React.createElement("p", {
+  }), /*#__PURE__*/React.createElement("p", {
+    className: "code-title"
+  }, "\u7B7E\u7F72\u4E8C\u7EF4\u7801"), /*#__PURE__*/React.createElement("p", {
     className: "tip"
   }, "\u60A8\u53EF\u4EE5\u5C06\u4E8C\u7EF4\u7801\u622A\u56FE\u5206\u4EAB\u81F3\u7B7E\u7F72\u65B9\uFF0C\u4E5F\u53EF\u70B9\u51FB\u4E0B\u65B9\u6309\u94AE\u5C06\u94FE\u63A5\u53D1\u9001\u81F3\u7B7E\u7F72\u65B9\uFF0C\u7B7E\u7F72\u65B9\u9700\u767B\u5F55\u4E09\u664B\u901A\u5C0F\u7A0B\u5E8F\uFF0C\u540C\u4E00\u4EFD\u6750\u6599\u8BF7\u52FF\u591A\u4EBA\u540C\u65F6\u7B7E\u7F72"), /*#__PURE__*/React.createElement("div", {
     className: "copy-link",

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

@@ -23,7 +23,34 @@
 
   }
 
-  
+  .code-title {
+    font-size: 18px;
+    font-weight: 500;
+    margin-top: 24px;
+    color: #333333;
+    margin-bottom: 12px;
+  }
+
+  .tip {
+    font-size: 15px;
+    color: #666666;
+    width: 90%;
+  }
+
+  .copy-link {
+    height: 40px;
+    border-radius: 50px;
+    text-align: center;
+    line-height: 40px;
+    color: #1678FF;
+    font-size: 16px;
+    font-weight: 500;
+    box-sizing: border-box;
+    border: 1px solid #1678FF;
+    width: 90%;
+    margin-top: 40px;
+  }
+
 }
 .signer-info {
   min-height: 50%;

package/es/components/sign-file/index.js

@@ -68,7 +68,7 @@ var SignFile = function SignFile(_ref) {
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (fileUrl) {
+            if (fileId) {
               _context.next = 1;
               break;
             }
@@ -201,24 +201,38 @@ var SignFile = function SignFile(_ref) {
   // 获取预览图片
   var getViewUrl = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4(id) {
-      var type, urlRes, res, list;
+      var type, _urlRes, urlRes, res, list;
       return _regeneratorRuntime.wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             type = getFileExtension(fileName);
             if (!['png', 'jpg', 'jpeg'].includes(type)) {
-              _context4.next = 1;
+              _context4.next = 2;
               break;
             }
-            return _context4.abrupt("return", fileUrl);
+            _context4.next = 1;
+            return getUrlById({
+              id: fileId,
+              effectiveTime: 3600000
+            }, {
+              token: token,
+              tokenTY: tokenTY,
+              baseUrl: baseUrl,
+              env: env,
+              isPC: isPC,
+              accessToken: accessToken
+            });
           case 1:
+            _urlRes = _context4.sent;
+            return _context4.abrupt("return", _urlRes.presignedUrlList[2]);
+          case 2:
             if (!(type !== 'pdf')) {
-              _context4.next = 2;
+              _context4.next = 3;
               break;
             }
             return _context4.abrupt("return", '');
-          case 2:
-            _context4.next = 3;
+          case 3:
+            _context4.next = 4;
             return getUrlById({
               id: id,
               effectiveTime: 3600000
@@ -230,14 +244,14 @@ var SignFile = function SignFile(_ref) {
               isPC: isPC,
               accessToken: accessToken
             });
-          case 3:
+          case 4:
             urlRes = _context4.sent;
             if (!(urlRes.presignedUrlList && urlRes.presignedUrlList.length > 0)) {
-              _context4.next = 6;
+              _context4.next = 7;
               break;
             }
             console.log('urlRes', urlRes);
-            _context4.next = 4;
+            _context4.next = 5;
             return onlinePreview({
               url: urlRes.presignedUrlList[2]
             }, {
@@ -248,15 +262,15 @@ var SignFile = function SignFile(_ref) {
               isPC: isPC,
               accessToken: accessToken
             });
-          case 4:
+          case 5:
             res = _context4.sent;
-            _context4.next = 5;
+            _context4.next = 6;
             return extractImageUrls(res.url);
-          case 5:
+          case 6:
             list = _context4.sent;
             console.log('list---', list);
             return _context4.abrupt("return", list[0]);
-          case 6:
+          case 7:
           case "end":
             return _context4.stop();
         }
@@ -314,10 +328,10 @@ var SignFile = function SignFile(_ref) {
     fullScreen: true,
     visible: loading
   }, /*#__PURE__*/React.createElement("div", {
-    className: "sign_file_main"
-  }, /*#__PURE__*/React.createElement("div", {
-    className: "sign_file_item",
+    className: "sign_file_main",
     style: style
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "sign_file_item"
   }, /*#__PURE__*/React.createElement("div", {
     className: "file"
   }, /*#__PURE__*/React.createElement("div", {

package/es/components/sign-file/index.scss

@@ -2,6 +2,8 @@
   display: flex;
   flex-direction: column;
   height: 100%;
+  padding: 20px 0;
+  flex: 1;
   justify-content: space-between;
   .sign_btn {
     height: 40px;
@@ -19,7 +21,7 @@
   .sign_file_item {
     border-radius: 8px;
     opacity: 1;
-    background: #F7F7F7;
+    background: #ffffff;
     padding: 12px;
     width: 100%;
 
@@ -51,7 +53,7 @@
         }
 
         .small_img {
-          width: 100%;
+          height: 80px;
 
         }
 

package/lib/components/file-list/index.d.ts

@@ -5,7 +5,7 @@ export interface FileListProps {
      * 列表数据
      */
     fileList: Array<object>;
-    signerInfo: object;
+    signerInfo?: object;
     token: string;
     tokenTY: string;
     accessToken: string;

package/lib/components/file-list/item.d.ts

@@ -18,7 +18,7 @@ export interface FileItemProps {
     isInValid: boolean;
     userInfo: object;
     style?: object;
-    signerInfo: object;
+    signerInfo?: object;
     openLoading: () => void;
     closeLoading: () => void;
     valChange: (value: any, fileIndex: any, index: any, subIndex: any) => void;

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

@@ -894,7 +894,9 @@ var FileItem = function FileItem(_ref) {
       console.log('close');
       setShowSignerInfo(false);
     },
-    saveSignerInfo: saveSignerInfo
+    saveSignerInfo: saveSignerInfo,
+    signatureEnable: signatureEnable,
+    signEnable: signEnable
   }));
 };
 FileItem.displayName = 'FileItem';

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

@@ -20,7 +20,9 @@ var RadioGroup = _radio["default"].Group;
 function SignerInfo(props) {
   var handleClose = props.handleClose,
     signerInfo = props.signerInfo,
-    saveSignerInfo = props.saveSignerInfo;
+    saveSignerInfo = props.saveSignerInfo,
+    signatureEnable = props.signatureEnable,
+    signEnable = props.signEnable;
   var _React$useState = _react["default"].useState([]),
     signerInfoList = _React$useState[0],
     setSignerInfoList = _React$useState[1];
@@ -28,7 +30,7 @@ function SignerInfo(props) {
     showQRcode = _useState[0],
     setShowQRcode = _useState[1];
   var canvasRef = (0, _react.useRef)(null);
-  var _useState2 = (0, _react.useState)('123123'),
+  var _useState2 = (0, _react.useState)(''),
     url = _useState2[0],
     setUrl = _useState2[1];
   var handleFieldChange = function handleFieldChange(field, val, index) {
@@ -48,7 +50,7 @@ function SignerInfo(props) {
           case 1:
             saveRes = _context.sent;
             if (saveRes) {
-              setUrl('12312312');
+              setUrl("https://zwfw.xzspglj.taiyuan.gov.cn/threeSign?draftNo=" + saveRes);
               setShowQRcode(true);
             } else {
               _message["default"].warning('信息保存失败，请重试');
@@ -77,15 +79,31 @@ function SignerInfo(props) {
   };
   (0, _react.useEffect)(function () {
     if (signerInfo) {
-      setSignerInfoList([signerInfo]);
+      console.log('signerInfo', signerInfo);
+      var corpName = signerInfo.corpName,
+        certificateSno = signerInfo.certificateSno,
+        legalMobile = signerInfo.legalMobile;
+      setSignerInfoList([{
+        signType: 1,
+        signerCompany: corpName,
+        signerCertificateSno: certificateSno,
+        signerPhoneNum: legalMobile
+      }]);
+    } else {
+      setSignerInfoList([{
+        signType: 0,
+        signerName: '',
+        signerCompany: '',
+        signContent: ''
+      }]);
     }
   }, [signerInfo]);
   (0, _react.useEffect)(function () {
     if (canvasRef.current) {
       var options = {
-        width: 250,
+        width: 110,
         // 二维码的宽度
-        height: 250,
+        height: 110,
         // 二维码的高度
         color: {
           dark: '#000000',
@@ -203,7 +221,7 @@ function SignerInfo(props) {
     }, "*")), /*#__PURE__*/_react["default"].createElement(_input["default"], {
       className: "signer-info-input",
       placeholder: "\u8BF7\u8F93\u5165",
-      value: item.signerCompany,
+      value: item.signerCertificateSno,
       onChange: function onChange(val) {
         return handleFieldChange('signerCompany', val, index);
       }
@@ -222,16 +240,13 @@ function SignerInfo(props) {
         return handleFieldChange('signContent', val, index);
       },
       "aria-labelledby": "groupId"
-    }, /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+    }, signatureEnable && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
       id: "1",
       value: "1"
-    }, "\u4EC5\u7B7E\u540D"), /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
+    }, "\u4EC5\u7B7E\u540D"), signEnable && item.signType === 1 && /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
       id: "2",
       value: "2"
-    }, "\u4EC5\u7B7E\u7AE0"), /*#__PURE__*/_react["default"].createElement(_checkbox["default"], {
-      id: "3",
-      value: "3"
-    }, "\u7B7E\u540D\u548C\u7B7E\u7AE0")))));
+    }, "\u4EC5\u7B7E\u7AE0")))));
   })), /*#__PURE__*/_react["default"].createElement("div", {
     className: "footer"
   }, /*#__PURE__*/_react["default"].createElement("div", {
@@ -253,7 +268,9 @@ function SignerInfo(props) {
   }), /*#__PURE__*/_react["default"].createElement("canvas", {
     className: "qrcode-canvas",
     ref: canvasRef
-  }), /*#__PURE__*/_react["default"].createElement("p", null, "\u7B7E\u7F72\u4E8C\u7EF4\u7801"), /*#__PURE__*/_react["default"].createElement("p", {
+  }), /*#__PURE__*/_react["default"].createElement("p", {
+    className: "code-title"
+  }, "\u7B7E\u7F72\u4E8C\u7EF4\u7801"), /*#__PURE__*/_react["default"].createElement("p", {
     className: "tip"
   }, "\u60A8\u53EF\u4EE5\u5C06\u4E8C\u7EF4\u7801\u622A\u56FE\u5206\u4EAB\u81F3\u7B7E\u7F72\u65B9\uFF0C\u4E5F\u53EF\u70B9\u51FB\u4E0B\u65B9\u6309\u94AE\u5C06\u94FE\u63A5\u53D1\u9001\u81F3\u7B7E\u7F72\u65B9\uFF0C\u7B7E\u7F72\u65B9\u9700\u767B\u5F55\u4E09\u664B\u901A\u5C0F\u7A0B\u5E8F\uFF0C\u540C\u4E00\u4EFD\u6750\u6599\u8BF7\u52FF\u591A\u4EBA\u540C\u65F6\u7B7E\u7F72"), /*#__PURE__*/_react["default"].createElement("div", {
     className: "copy-link",

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

@@ -23,7 +23,34 @@
 
   }
 
-  
+  .code-title {
+    font-size: 18px;
+    font-weight: 500;
+    margin-top: 24px;
+    color: #333333;
+    margin-bottom: 12px;
+  }
+
+  .tip {
+    font-size: 15px;
+    color: #666666;
+    width: 90%;
+  }
+
+  .copy-link {
+    height: 40px;
+    border-radius: 50px;
+    text-align: center;
+    line-height: 40px;
+    color: #1678FF;
+    font-size: 16px;
+    font-weight: 500;
+    box-sizing: border-box;
+    border: 1px solid #1678FF;
+    width: 90%;
+    margin-top: 40px;
+  }
+
 }
 .signer-info {
   min-height: 50%;

package/lib/components/sign-file/index.js

@@ -75,7 +75,7 @@ var SignFile = function SignFile(_ref) {
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (fileUrl) {
+            if (fileId) {
               _context.next = 1;
               break;
             }
@@ -208,24 +208,38 @@ var SignFile = function SignFile(_ref) {
   // 获取预览图片
   var getViewUrl = /*#__PURE__*/function () {
     var _ref5 = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee4(id) {
-      var type, urlRes, res, list;
+      var type, _urlRes, urlRes, res, list;
       return _regenerator["default"].wrap(function (_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             type = (0, _file2.getFileExtension)(fileName);
             if (!['png', 'jpg', 'jpeg'].includes(type)) {
-              _context4.next = 1;
+              _context4.next = 2;
               break;
             }
-            return _context4.abrupt("return", fileUrl);
+            _context4.next = 1;
+            return (0, _api.getUrlById)({
+              id: fileId,
+              effectiveTime: 3600000
+            }, {
+              token: token,
+              tokenTY: tokenTY,
+              baseUrl: baseUrl,
+              env: env,
+              isPC: isPC,
+              accessToken: accessToken
+            });
           case 1:
+            _urlRes = _context4.sent;
+            return _context4.abrupt("return", _urlRes.presignedUrlList[2]);
+          case 2:
             if (!(type !== 'pdf')) {
-              _context4.next = 2;
+              _context4.next = 3;
               break;
             }
             return _context4.abrupt("return", '');
-          case 2:
-            _context4.next = 3;
+          case 3:
+            _context4.next = 4;
             return (0, _api.getUrlById)({
               id: id,
               effectiveTime: 3600000
@@ -237,14 +251,14 @@ var SignFile = function SignFile(_ref) {
               isPC: isPC,
               accessToken: accessToken
             });
-          case 3:
+          case 4:
             urlRes = _context4.sent;
             if (!(urlRes.presignedUrlList && urlRes.presignedUrlList.length > 0)) {
-              _context4.next = 6;
+              _context4.next = 7;
               break;
             }
             console.log('urlRes', urlRes);
-            _context4.next = 4;
+            _context4.next = 5;
             return (0, _api.onlinePreview)({
               url: urlRes.presignedUrlList[2]
             }, {
@@ -255,15 +269,15 @@ var SignFile = function SignFile(_ref) {
               isPC: isPC,
               accessToken: accessToken
             });
-          case 4:
+          case 5:
             res = _context4.sent;
-            _context4.next = 5;
+            _context4.next = 6;
             return extractImageUrls(res.url);
-          case 5:
+          case 6:
             list = _context4.sent;
             console.log('list---', list);
             return _context4.abrupt("return", list[0]);
-          case 6:
+          case 7:
           case "end":
             return _context4.stop();
         }
@@ -321,10 +335,10 @@ var SignFile = function SignFile(_ref) {
     fullScreen: true,
     visible: loading
   }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "sign_file_main"
-  }, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "sign_file_item",
+    className: "sign_file_main",
     style: style
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "sign_file_item"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "file"
   }, /*#__PURE__*/_react["default"].createElement("div", {

package/lib/components/sign-file/index.scss

@@ -2,6 +2,8 @@
   display: flex;
   flex-direction: column;
   height: 100%;
+  padding: 20px 0;
+  flex: 1;
   justify-content: space-between;
   .sign_btn {
     height: 40px;
@@ -19,7 +21,7 @@
   .sign_file_item {
     border-radius: 8px;
     opacity: 1;
-    background: #F7F7F7;
+    background: #ffffff;
     padding: 12px;
     width: 100%;
 
@@ -51,7 +53,7 @@
         }
 
         .small_img {
-          width: 100%;
+          height: 80px;
 
         }
 

package/lowcode/file-list/meta.ts

@@ -72,8 +72,8 @@ const FileListMeta: IPublicTypeComponentMetadata = {
               }
             }
           },
-          "isRequired": true,
-          "initialValue": []
+          "isRequired": false,
+          "initialValue": undefined
         }
       },
       {

package/lowcode_es/file-list/meta.js

@@ -68,8 +68,8 @@ var FileListMeta = {
             }
           }
         },
-        "isRequired": true,
-        "initialValue": []
+        "isRequired": false,
+        "initialValue": undefined
       }
     }, {
       "title": {

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.109';
+    version = '0.1.110';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {

package/lowcode_lib/file-list/meta.js

@@ -73,8 +73,8 @@ var FileListMeta = {
             }
           }
         },
-        "isRequired": true,
-        "initialValue": []
+        "isRequired": false,
+        "initialValue": undefined
       }
     }, {
       "title": {

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.109';
+    version = '0.1.110';
   }
   if (basicLibraryVersion === void 0) {
     basicLibraryVersion = {