ydb-components-material 0.1.63 → 0.1.65

package/es/api.js

@@ -9,6 +9,9 @@ export var post = /*#__PURE__*/function () {
           if (noJson === void 0) {
             noJson = false;
           }
+          if (window.env === 'release') {
+            url = url.replace('zwfwpt.sxzwfw.gov.cn', 'zwfwpt.sxzwfw.gov.cn:10010');
+          }
           _context.next = 1;
           return fetch(url, {
             method: 'POST',

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

@@ -120,6 +120,9 @@ var FileItem = function FileItem(_ref) {
   var _useState13 = useState(null),
     checkPointData = _useState13[0],
     setCheckPointData = _useState13[1];
+  var _useState14 = useState(''),
+    oldUrl = _useState14[0],
+    setOldUrl = _useState14[1];
   var showViewImg = function showViewImg(url) {
     setIsShowView(true);
     setViewImg(url);
@@ -229,13 +232,24 @@ var FileItem = function FileItem(_ref) {
     // handleSeal()
     setIsShowSealPage(true);
   };
+
+  // 获取签pi结果
   var getRes = function getRes(val) {
     console.log('val---', val);
+    if (val.fileUrl && !oldUrl) {
+      setOldUrl(val.oldUrl);
+    }
     valChange(val);
   };
+
+  // 获取签章结果
   var getSealRes = function getSealRes(val) {
     console.log('sealval---', val);
-    valChange(val);
+    if (val.fileUrl && !oldUrl) {
+      setOldUrl(val.oldUrl);
+    }
+    // valChange(val)
+    sign();
   };
   var queryFileLibs = function queryFileLibs() {
     console.log('queryFileLibs');
@@ -273,7 +287,10 @@ var FileItem = function FileItem(_ref) {
       return;
     }
     fetch(baseUrl + "/declaration/material/file/files/api/presigned-url?id=" + guideImg + "&effectiveTime=3600000", {
-      method: 'GET'
+      method: 'GET',
+      headers: {
+        'Authorization': tokenTY
+      }
     }).then(function (response) {
       return response.json();
     }).then(function (res) {
@@ -507,7 +524,8 @@ var FileItem = function FileItem(_ref) {
     file: {
       name: fileName,
       url: fileUrl,
-      type: fileType
+      type: fileType,
+      oldUrl: isSigned ? oldUrl : ''
     },
     token: token,
     tokenTY: tokenTY,
@@ -523,7 +541,8 @@ var FileItem = function FileItem(_ref) {
       name: fileName,
       url: fileUrl,
       type: fileType,
-      fileId: fileId
+      fileId: fileId,
+      oldUrl: isSealed ? oldUrl : ''
     },
     token: token,
     tokenTY: tokenTY,

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

@@ -27,11 +27,15 @@ function SealPage(props) {
   var elementRef = useRef(null);
   var handleRes = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var res, pageUrl, orderIdVal;
+      var fileObj, res, pageUrl, orderIdVal;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             console.log('file', file, userInfo);
+            fileObj = file;
+            if (file.oldUrl) {
+              fileObj.url = file.oldUrl;
+            }
             _context.next = 1;
             return initSealPageMethod(file, userInfo, token, accessToken, baseUrl, tokenTY, isPC);
           case 1:
@@ -85,6 +89,7 @@ function SealPage(props) {
               finalFile = _extends({
                 name: file.name,
                 url: uploadRes.data.fileUrl,
+                oldUrl: file.url,
                 isSealed: true
               }, uploadRes.data);
               getSealRes(finalFile);

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

@@ -28,10 +28,14 @@ function SignPage(props) {
   var timerRef = useRef(null);
   var init = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var res, documentIdVal, contractIdVal, pageUrl, nameVal;
+      var fileObj, res, documentIdVal, contractIdVal, pageUrl, nameVal;
       return _regeneratorRuntime.wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            fileObj = file;
+            if (file.oldUrl) {
+              fileObj.url = file.oldUrl;
+            }
             _context.next = 1;
             return initSignPageMethod(file, userInfo, token, device);
           case 1:
@@ -74,7 +78,8 @@ function SignPage(props) {
               finalFile = _extends({
                 name: nameVal,
                 url: newFile.fileUrlList[0],
-                isSigned: true
+                isSigned: true,
+                oldUrl: file.url
               }, newFile);
               console.log('finalFile---', finalFile);
               getRes(finalFile);

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

@@ -209,7 +209,7 @@ function getContractSignUrl(contractIdVal, userInfo, token) {
   });
 }
 
-// 【第4步】获取签章页面
+// 【第4步】获取签pi页面
 function getSignUrl(userInfo, token, device) {
   // uni.showLoading({ title: '加载中' })
   var params = {

package/lib/api.js

@@ -14,6 +14,9 @@ var post = exports.post = /*#__PURE__*/function () {
           if (noJson === void 0) {
             noJson = false;
           }
+          if (window.env === 'release') {
+            url = url.replace('zwfwpt.sxzwfw.gov.cn', 'zwfwpt.sxzwfw.gov.cn:10010');
+          }
           _context.next = 1;
           return fetch(url, {
             method: 'POST',

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

@@ -126,6 +126,9 @@ var FileItem = function FileItem(_ref) {
   var _useState13 = (0, _react.useState)(null),
     checkPointData = _useState13[0],
     setCheckPointData = _useState13[1];
+  var _useState14 = (0, _react.useState)(''),
+    oldUrl = _useState14[0],
+    setOldUrl = _useState14[1];
   var showViewImg = function showViewImg(url) {
     setIsShowView(true);
     setViewImg(url);
@@ -235,13 +238,24 @@ var FileItem = function FileItem(_ref) {
     // handleSeal()
     setIsShowSealPage(true);
   };
+
+  // 获取签pi结果
   var getRes = function getRes(val) {
     console.log('val---', val);
+    if (val.fileUrl && !oldUrl) {
+      setOldUrl(val.oldUrl);
+    }
     valChange(val);
   };
+
+  // 获取签章结果
   var getSealRes = function getSealRes(val) {
     console.log('sealval---', val);
-    valChange(val);
+    if (val.fileUrl && !oldUrl) {
+      setOldUrl(val.oldUrl);
+    }
+    // valChange(val)
+    sign();
   };
   var queryFileLibs = function queryFileLibs() {
     console.log('queryFileLibs');
@@ -279,7 +293,10 @@ var FileItem = function FileItem(_ref) {
       return;
     }
     fetch(baseUrl + "/declaration/material/file/files/api/presigned-url?id=" + guideImg + "&effectiveTime=3600000", {
-      method: 'GET'
+      method: 'GET',
+      headers: {
+        'Authorization': tokenTY
+      }
     }).then(function (response) {
       return response.json();
     }).then(function (res) {
@@ -513,7 +530,8 @@ var FileItem = function FileItem(_ref) {
     file: {
       name: fileName,
       url: fileUrl,
-      type: fileType
+      type: fileType,
+      oldUrl: isSigned ? oldUrl : ''
     },
     token: token,
     tokenTY: tokenTY,
@@ -529,7 +547,8 @@ var FileItem = function FileItem(_ref) {
       name: fileName,
       url: fileUrl,
       type: fileType,
-      fileId: fileId
+      fileId: fileId,
+      oldUrl: isSealed ? oldUrl : ''
     },
     token: token,
     tokenTY: tokenTY,

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

@@ -33,11 +33,15 @@ function SealPage(props) {
   var elementRef = (0, _react.useRef)(null);
   var handleRes = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var res, pageUrl, orderIdVal;
+      var fileObj, res, pageUrl, orderIdVal;
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             console.log('file', file, userInfo);
+            fileObj = file;
+            if (file.oldUrl) {
+              fileObj.url = file.oldUrl;
+            }
             _context.next = 1;
             return (0, _sealUtil.initSealPageMethod)(file, userInfo, token, accessToken, baseUrl, tokenTY, isPC);
           case 1:
@@ -91,6 +95,7 @@ function SealPage(props) {
               finalFile = (0, _extends2["default"])({
                 name: file.name,
                 url: uploadRes.data.fileUrl,
+                oldUrl: file.url,
                 isSealed: true
               }, uploadRes.data);
               getSealRes(finalFile);

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

@@ -34,10 +34,14 @@ function SignPage(props) {
   var timerRef = (0, _react.useRef)(null);
   var init = /*#__PURE__*/function () {
     var _ref = (0, _asyncToGenerator2["default"])(/*#__PURE__*/_regenerator["default"].mark(function _callee() {
-      var res, documentIdVal, contractIdVal, pageUrl, nameVal;
+      var fileObj, res, documentIdVal, contractIdVal, pageUrl, nameVal;
       return _regenerator["default"].wrap(function (_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            fileObj = file;
+            if (file.oldUrl) {
+              fileObj.url = file.oldUrl;
+            }
             _context.next = 1;
             return (0, _signUtil.initSignPageMethod)(file, userInfo, token, device);
           case 1:
@@ -80,7 +84,8 @@ function SignPage(props) {
               finalFile = (0, _extends2["default"])({
                 name: nameVal,
                 url: newFile.fileUrlList[0],
-                isSigned: true
+                isSigned: true,
+                oldUrl: file.url
               }, newFile);
               console.log('finalFile---', finalFile);
               getRes(finalFile);

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

@@ -213,7 +213,7 @@ function getContractSignUrl(contractIdVal, userInfo, token) {
   });
 }
 
-// 【第4步】获取签章页面
+// 【第4步】获取签pi页面
 function getSignUrl(userInfo, token, device) {
   // uni.showLoading({ title: '加载中' })
   var params = {

package/lowcode_es/meta.js

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

package/lowcode_lib/meta.js

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

package/package.json

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