utiller 1.0.265 → 1.0.267

package/lib/utiller/index.js

@@ -2948,10 +2948,11 @@ var Utiller = /*#__PURE__*/function () {
     key: "extractNumber",
     value: function extractNumber(str) {
       // 使用正則表達式提取數字部分
+      if (this.isUndefinedNullEmpty(str)) return -1;
       var match = str.match(/\d+/);
 
       // 如果找到數字，轉換為數字型態並回傳
-      return match ? Number(match[0]) : null;
+      return match ? Number(match[0]) : -1;
     }
 
     /** puppeteer 的 fetch function
@@ -2961,7 +2962,8 @@ var Utiller = /*#__PURE__*/function () {
     key: "fetchElementAttributes",
     value: (function () {
       var _fetchElementAttributes = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee8(dom, stringOfTrait) {
-        var element,
+        var defaultValue,
+          element,
           _len25,
           attributes,
           _key27,
@@ -2969,33 +2971,38 @@ var Utiller = /*#__PURE__*/function () {
         return _regenerator["default"].wrap(function _callee8$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              _context9.next = 2;
+              defaultValue = _args9.length > 2 && _args9[2] !== undefined ? _args9[2] : "";
+              _context9.next = 3;
               return dom.$(stringOfTrait);
-            case 2:
+            case 3:
               element = _context9.sent;
-              for (_len25 = _args9.length, attributes = new Array(_len25 > 2 ? _len25 - 2 : 0), _key27 = 2; _key27 < _len25; _key27++) {
-                attributes[_key27 - 2] = _args9[_key27];
-              }
               if (this.isUndefinedNullEmpty(element)) {
-                _context9.next = 10;
+                _context9.next = 16;
                 break;
               }
-              _context9.next = 7;
+              for (_len25 = _args9.length, attributes = new Array(_len25 > 3 ? _len25 - 3 : 0), _key27 = 3; _key27 < _len25; _key27++) {
+                attributes[_key27 - 3] = _args9[_key27];
+              }
+              _context9.prev = 6;
+              _context9.next = 9;
               return element.evaluate(function (el, attributes) {
                 if (attributes.length === 1) return el[attributes.shift()];
                 return _objectSpread({}, attributes.map(function (attr) {
                   return el[attr];
                 })); //或者 el.getAttribute('src') 更精確!
               }, attributes);
-            case 7:
+            case 9:
               return _context9.abrupt("return", _context9.sent);
-            case 10:
+            case 12:
+              _context9.prev = 12;
+              _context9.t0 = _context9["catch"](6);
               this.appendError("1581532 ".concat(stringOfTrait, " fetch ").concat(JSON.stringify(attributes), " fail, element is not found"));
-            case 11:
+              return _context9.abrupt("return", defaultValue);
+            case 16:
             case "end":
               return _context9.stop();
           }
-        }, _callee8, this);
+        }, _callee8, this, [[6, 12]]);
       }));
       function fetchElementAttributes(_x5, _x6) {
         return _fetchElementAttributes.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utiller",
-  "version": "1.0.265",
+  "version": "1.0.267",
   "description": "",
   "main": "index.js",
   "scripts": {

package/template/sample.package.json

@@ -11,7 +11,7 @@
   "license": "ISC",
   "dependencies": {
     "configerer": "^1.0.11",
-    "utiller": "^1.0.264",
+    "utiller": "^1.0.266",
     "linepayer": "^1.0.4",
     "databazer": "^1.0.12",
     "lodash": "^4.17.20",