kmkf-work-order-service-component 0.0.1-alpha.23 → 0.0.1-alpha.25

package/dist/esm/WorkOrder/common/utils/tools.js

@@ -684,7 +684,7 @@ export var orderBack = /*#__PURE__*/function () {
                 switch (next) {
                   case 'province':
                     prv[uniqueKey] = {
-                      address: [detail['province'], detail['city'], detail['district']],
+                      address: [+detail['province'], +detail['city'], +detail['district']],
                       detail: detail['address'] || ''
                     };
                     break;

package/dist/esm/WorkOrder/components/CustomizeFormModal/index.js

@@ -223,7 +223,19 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
             case 34:
               _context.prev = 34;
               _context.t0 = _context["catch"](0);
-              console.error(_context.t0);
+
+              // 表单校验失败错误时，将错误第一项滚动到可视区域
+              if (get(_context.t0, 'errorFields.length') > 0) {
+                setTimeout(function () {
+                  var _get;
+
+                  var errorList = document.querySelectorAll('.ant-form-item-has-error');
+                  (_get = get(errorList, '0')) === null || _get === void 0 ? void 0 : _get.scrollIntoView({
+                    block: 'center',
+                    behavior: 'smooth'
+                  });
+                }, 0);
+              }
 
             case 37:
             case "end":
@@ -402,7 +414,6 @@ var CustomizeFormModal = function CustomizeFormModal(props, ref) {
         orderNo = _ref4.orderNo,
         buyerId = _ref4.buyerId,
         buyerNick = _ref4.buyerNick;
-    // console.log('openModal---------', templateId, shopId, workOrderId, (record = {}));
     setVisible(true);
     setTemplateId(templateId);
     setWorkOrderId(workOrderId);

package/dist/esm/WorkOrder/components/PayListOrderItem/ModifyModal.js

@@ -32,6 +32,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import React, { useState, useImperativeHandle, forwardRef } from 'react';
 import { Drawer, Form, Spin, Input, Space, Button, message } from 'antd';
+import { get } from 'lodash';
 import { decodeAlipayInfo, editRemitOrder, addPaymentOrder } from "../../model/servers/api";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -152,7 +153,17 @@ function ModifyModal(props, ref) {
         return _ref.apply(this, arguments);
       };
     }()).catch(function (err) {
-      console.log(err);
+      if (get(err, 'errorFields.length') > 0) {
+        setTimeout(function () {
+          var _get;
+
+          var errorList = document.querySelectorAll('.ant-form-item-has-error');
+          (_get = get(errorList, '0')) === null || _get === void 0 ? void 0 : _get.scrollIntoView({
+            block: 'center',
+            behavior: 'smooth'
+          });
+        }, 0);
+      }
     });
   };
 

package/dist/esm/WorkOrder/components/Widget/electricity/EItemEncode/index.js

@@ -35,7 +35,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-08-15 14:37:33
  * @LastEditors: litian
- * @LastEditTime: 2022-09-27 10:55:47
+ * @LastEditTime: 2022-10-12 13:50:58
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -59,7 +59,7 @@ var EItemSelect = /*#__PURE__*/function (_BasicComponent) {
       return [{
         required: true,
         validator: function validator(_, value) {
-          if (!value) {
+          if (!value || !value.length) {
             return Promise.reject(new Error('请选择宝贝'));
           }
 

package/dist/esm/WorkOrder/components/Widget/electricity/EItemId/index.js

@@ -35,7 +35,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-08-15 14:37:33
  * @LastEditors: litian
- * @LastEditTime: 2022-09-27 16:15:00
+ * @LastEditTime: 2022-10-12 13:51:07
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -59,7 +59,7 @@ var EItemId = /*#__PURE__*/function (_BasicComponent) {
       return [{
         required: true,
         validator: function validator(_, value) {
-          if (!value) {
+          if (!value || !value.length) {
             return Promise.reject(new Error('请选择宝贝'));
           }
 

package/dist/esm/WorkOrder/components/Widget/electricity/ETradeId/index.js

@@ -37,7 +37,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-06-30 17:30:05
  * @LastEditors: litian
- * @LastEditTime: 2022-09-20 09:24:55
+ * @LastEditTime: 2022-10-12 10:40:23
  */
 import React from 'react';
 import Input from "../../basic/Input";
@@ -132,6 +132,14 @@ var ETradeId = /*#__PURE__*/function (_Input) {
           while (1) {
             switch (_context.prev = _context.next) {
               case 0:
+                if (order_no) {
+                  _context.next = 2;
+                  break;
+                }
+
+                return _context.abrupt("return");
+
+              case 2:
                 _this$effects = this.effects, form = _this$effects.form, shopId = _this$effects.shopId, shopList = _this$effects.shopList, templateDetail = _this$effects.templateDetail;
 
                 if (this.time) {
@@ -148,7 +156,7 @@ var ETradeId = /*#__PURE__*/function (_Input) {
                   });
                 }, 1000);
 
-              case 3:
+              case 5:
               case "end":
                 return _context.stop();
             }

package/dist/esm/WorkOrder/components/Widget/third/ItemSelect/index.js

@@ -35,7 +35,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
  * @Author: litian
  * @Date: 2022-08-15 14:37:33
  * @LastEditors: litian
- * @LastEditTime: 2022-09-27 10:56:05
+ * @LastEditTime: 2022-10-12 13:50:50
  */
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
@@ -67,7 +67,7 @@ var ItemSelectThird = /*#__PURE__*/function (_BasicComponent) {
       return [{
         required: true,
         validator: function validator(_, value) {
-          if (!value) {
+          if (!value || !value.length) {
             return Promise.reject(new Error('请选择宝贝'));
           }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.0.1-alpha.23",
+  "version": "0.0.1-alpha.25",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -37,7 +37,7 @@
     "react-dom": "^17.0.2"
   },
   "dependencies": {
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.22-alpha.3",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.0.22-alpha.5",
     "@reduxjs/toolkit": "^1.8.5",
     "react-redux": "^7.2.8",
     "store2": "^2.14.2",