kmkf-work-order-service-component 0.4.0-alpha.2 → 0.4.0-alpha.20

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

@@ -97,6 +97,8 @@ var getTableData = function getTableData(_ref) {
       params.buyerOpenUid = buyerId;
     }
 
+    delete params.time; // time是moment类型的，监控上报的时侯，格式化报错了
+
     return queryAllWorkOrderList(URL_MAPPING[type], _objectSpread(_objectSpread({}, params), {}, {
       pageSize: pageSize,
       pageNo: current
@@ -135,6 +137,9 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
   var groupAllList = useAppSelector(function (state) {
     return state.workOrder.groupAllList;
   });
+  var enabledTemplateList = useAppSelector(function (state) {
+    return state.workOrder.enabledTemplateList;
+  });
   var shopList = useAppSelector(function (state) {
     return state.workOrder.userInfo.shopList;
   });
@@ -176,8 +181,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
       pagination = tableProps.pagination,
       _onChange = tableProps.onChange;
   useEffect(function () {
-    // 当total有值以后将不在执行,以便从后面切换到第一页时闪动
-    if (pagination.current === 1 && total === 0) {
+    if (pagination.current === 1) {
       setTotal(pagination.total);
     }
   }, [pagination, total]);
@@ -322,7 +326,8 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
         className: "custom_box_main custom_box_main_".concat(platform),
         children: dataSource.length > 0 ? dataSource.map(function (item) {
           return /*#__PURE__*/_jsx(CustomizeWorkOrderCard, {
-            item: item
+            item: item,
+            enabledTemplateList: enabledTemplateList
           }, item.id);
         }) : /*#__PURE__*/_jsx("div", {
           className: "custom_box_main_empty",
@@ -357,7 +362,7 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
         width: platform === PlatForm.XIAOZHI ? '100%' : '90%'
       }), /*#__PURE__*/_jsx(Drawer, {
         closeIcon: /*#__PURE__*/_jsx(LeftOutlined, {}),
-        title: title,
+        title: (record === null || record === void 0 ? void 0 : record.templateName) || title,
         width: platform === PlatForm.XIAOZHI ? '100%' : '90%',
         open: formRenderVisible,
         onClose: handleCloseFormModal,
@@ -393,6 +398,16 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref3) {
           onTemplateChange: function onTemplateChange(title) {
             return setTitle(title);
           },
+          formProps: {
+            labelCol: {
+              span: 6
+            },
+            wrapperCol: {
+              span: 18
+            },
+            className: 'customizeFormModalClassName'
+          },
+          isShowShopList: false,
           onFormSubmitSuccess: function onFormSubmitSuccess(val) {
             submit();
             handleCloseFormModal();

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.less

@@ -178,3 +178,86 @@
     text-overflow: ellipsis;
   }
 }
+
+.customizeFormModalClassName {
+  :global(.goods-uploaded-state) {
+    margin: 6px 0 5px 0;
+    padding-left: 7px;
+    font-size: 12px;
+  }
+
+  :global(.ant-picker) {
+    width: 100%;
+
+    box-shadow: none;
+    // background: #f2f3f5;
+    // border: none;
+
+    input {
+      &::placeholder {
+        color: #86909c;
+      }
+    }
+
+    &:hover {
+      border-color: #4583ff;
+    }
+  }
+
+  :global(.ant-radio-inner) {
+    background-color: #fff;
+  }
+
+  :global(.ant-select) {
+    width: 100% !important;
+
+    .ant-select-selector {
+      background: #f2f3f5 !important;
+    }
+  }
+
+  :global(.ant-form-item) {
+    margin-bottom: 8px;
+  }
+
+  :global(.ant-form-item .ant-form-item-label) {
+    padding: 0px;
+  }
+
+  :global(.ant-form-item-label) {
+    position: relative;
+    max-width: 100px;
+    overflow: initial;
+    color: rgba(0, 0, 0, 0.55);
+    font-size: 14px;
+    white-space: normal;
+    text-align: left;
+  }
+
+  :global(.form-item-label--index .ant-form-item-label label) {
+    text-align: left;
+  }
+
+  :global(.label-title--index) {
+    position: absolute;
+    color: #86909c;
+    font-family: 'PingFangSC-Semibold';
+  }
+
+  :global(.goods-title) {
+    color: #4e5969;
+    font-size: 12px;
+  }
+
+  :global(div.ant-form-item.invoice-title--basic label) {
+    padding-left: 0;
+    font-weight: normal;
+    font-family: 'PingFangSC-Regular';
+  }
+
+  :global(.payment-widgets--basic div.ant-form-item-label label) {
+    padding-left: 0;
+    font-weight: lighter;
+    font-family: 'PingFangSC-Regular';
+  }
+}

package/dist/esm/WorkOrder/components/Widget/basic/Picture/index.js

@@ -54,7 +54,7 @@ var BasicPicture = /*#__PURE__*/function (_BasicComponent) {
     _this = _super.call(this, options);
 
     _defineProperty(_assertThisInitialized(_this), "render", function (value) {
-      return value === null || value === void 0 ? void 0 : value.map(function (pic) {
+      return value.length ? value === null || value === void 0 ? void 0 : value.map(function (pic) {
         return /*#__PURE__*/_jsx("div", {
           style: {
             marginRight: '5px',
@@ -68,7 +68,7 @@ var BasicPicture = /*#__PURE__*/function (_BasicComponent) {
             }
           })
         });
-      });
+      }) : /*#__PURE__*/_jsx("div", {});
     });
 
     _defineProperty(_assertThisInitialized(_this), "editRender", function (value) {

package/dist/esm/WorkOrder/components/Widget/common/formItemWrap.d.ts

@@ -5,9 +5,8 @@ declare type getFormItemProps = {
     rules?: any[];
     required: boolean;
     component: JSX.Element | string | null;
-    formItemIndex?: number;
 };
-export declare const getFormItem: ({ name, title, rules, required, component, formItemIndex, }: getFormItemProps) => JSX.Element;
+export declare const getFormItem: ({ name, title, rules, required, component }: getFormItemProps) => JSX.Element;
 export declare const showImage: ({ item, type }: {
     item: any;
     type: string;

package/dist/esm/WorkOrder/components/Widget/common/formItemWrap.js

@@ -23,8 +23,7 @@ export var getFormItem = function getFormItem(_ref) {
       _ref$rules = _ref.rules,
       rules = _ref$rules === void 0 ? [] : _ref$rules,
       required = _ref.required,
-      component = _ref.component,
-      formItemIndex = _ref.formItemIndex;
+      component = _ref.component;
   var newRules = rules;
 
   if (required) {
@@ -34,19 +33,6 @@ export var getFormItem = function getFormItem(_ref) {
     });
   }
 
-  var formIndexClassName = '';
-  var indexLabel = '';
-
-  if (formItemIndex != undefined) {
-    formIndexClassName = 'form-item-label--index';
-
-    if (formItemIndex >= 10) {
-      indexLabel = formItemIndex + '';
-    } else {
-      indexLabel = '0' + formItemIndex;
-    }
-  }
-
   return /*#__PURE__*/_jsx("div", {
     className: "form-item--wrap",
     style: {
@@ -56,7 +42,7 @@ export var getFormItem = function getFormItem(_ref) {
       name: name,
       label: title,
       rules: newRules,
-      className: formIndexClassName,
+      className: "form-item-label--index",
       children: component
     })
   });

package/dist/esm/WorkOrder/index.js

@@ -72,13 +72,13 @@ var WorkOrder = function WorkOrder(props) {
         type: 'workOrder/setIsBuyer',
         payload: true
       });
-      setCurrentBuyerChecked(true);
+      dispatch(setCurrentBuyerChecked(true));
     } else {
       dispatch({
         type: 'workOrder/setIsBuyer',
         payload: false
       });
-      setCurrentBuyerChecked(false);
+      dispatch(setCurrentBuyerChecked(false));
     }
   }, [buyerId]);
   useEffect(function () {

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

@@ -545,9 +545,8 @@ var transDataSource = function transDataSource(templateColumns) {
       } else if (nex.workOrderComponentType === 'DATETIME') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_dateTime")], item.jsonMap["".concat(nex.uniqueKey, "_dateTime")]) || config.dateTime));
       } else if (nex.workOrderComponentType === 'PICTURE') {
-        var host = cache.getHost();
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), item.jsonMap["".concat(nex.uniqueKey, "_picture")] ? formatPictures(item.jsonMap["".concat(nex.uniqueKey, "_picture")]).map(function (item) {
-          return "".concat(host, "/").concat(item);
+          return "".concat(item);
         }) : []));
       } else if (nex.workOrderComponentType === 'BASIC_MULT_SELECT') {
         return _objectSpread(_objectSpread({}, cur), {}, _defineProperty({}, "".concat(nex.uniqueKey), jsonParseSecurity(item.jsonMap["".concat(nex.uniqueKey, "_basicMultSelect")], '') || config.basicMultSelect || []));
@@ -652,17 +651,30 @@ export var orderBack = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref) {
     var _shopList$find;
 
-    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, shopSourceStr, _shopList$find2, _data$value, _buyer$value, taobaoId, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, buyer, orderInfo, buyerInfo, _ref3, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, itemList, transField, finalResponse, formValue, detail, componentsParams, detailsValue, _templateDetail$compo, paymentUniqueKey;
+    var order_no, form, shopId, shopList, templateDetail, _ref$type, type, callback, JOIN_SHOP, shopSourceStr, _shopList$find2, _data$value, _buyer$value, taobaoId, promise, _yield$Promise$allSet, _yield$Promise$allSet2, data, buyer, orderInfo, buyerInfo, _ref3, orderNo, provinceCode, cityCode, townCode, orderCreateDateTime, orderPaymentDateTime, orderDeliveryDateTime, orderClosingDateTime, itemList, transField, finalResponse, formValue, detail, componentsParams, detailsValue, _templateDetail$compo, paymentUniqueKey;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
             order_no = _ref.order_no, form = _ref.form, shopId = _ref.shopId, shopList = _ref.shopList, templateDetail = _ref.templateDetail, _ref$type = _ref.type, type = _ref$type === void 0 ? 'add' : _ref$type, callback = _ref.callback;
+            //是否是对接平台，只有对接平台才能返填订单号
+            JOIN_SHOP = shopList.find(function (item) {
+              return !item.notJoin && item.shopId == shopId;
+            });
+
+            if (JOIN_SHOP) {
+              _context.next = 4;
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 4:
             shopSourceStr = (_shopList$find = shopList.find(function (item) {
               return item.shopId == shopId;
             })) === null || _shopList$find === void 0 ? void 0 : _shopList$find.shopSourceStr;
-            _context.prev = 2;
+            _context.prev = 5;
             taobaoId = (_shopList$find2 = shopList.find(function (item) {
               return item.shopSourceStr === 'TAOBAO' && item.shopId == shopId;
             })) === null || _shopList$find2 === void 0 ? void 0 : _shopList$find2.taobaoId;
@@ -681,10 +693,10 @@ export var orderBack = /*#__PURE__*/function () {
             })) : promise.push(new Promise(function (resolve) {
               resolve({});
             }));
-            _context.next = 8;
+            _context.next = 11;
             return Promise.allSettled(promise);
 
-          case 8:
+          case 11:
             _yield$Promise$allSet = _context.sent;
             _yield$Promise$allSet2 = _slicedToArray(_yield$Promise$allSet, 2);
             data = _yield$Promise$allSet2[0];
@@ -813,19 +825,19 @@ export var orderBack = /*#__PURE__*/function () {
 
             form.setFieldsValue(_objectSpread(_objectSpread({}, formValue), detailsValue));
             callback === null || callback === void 0 ? void 0 : callback(finalResponse);
-            _context.next = 31;
+            _context.next = 34;
             break;
 
-          case 29:
-            _context.prev = 29;
-            _context.t0 = _context["catch"](2);
+          case 32:
+            _context.prev = 32;
+            _context.t0 = _context["catch"](5);
 
-          case 31:
+          case 34:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[2, 29]]);
+    }, _callee, null, [[5, 32]]);
   }));
 
   return function orderBack(_x) {
@@ -920,7 +932,8 @@ var getComponentsValue = function getComponentsValue() {
 export var imgResize = function imgResize(url) {
   var w = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 60;
   var h = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 60;
-  return "".concat(url, "?x-oss-process=image/resize,h_").concat(h, ",w_").concat(w);
+  var modifyUrl = url.startsWith('/') ? url : "/".concat(url);
+  return "https://kefu.kuaimai.com".concat(modifyUrl, "?x-oss-process=image/resize,h_").concat(h, ",w_").concat(w);
 }; //重复校验数据映射字段
 
 export var COMPONENT_MAP = {

package/dist/esm/model/customizeWorkOrder/api.d.ts

@@ -1,6 +1,11 @@
 import { serverProps } from '../servers/request';
-import { ColumnsConfigI } from './types';
+import { ColumnsConfigI, PlatIProp } from './types';
 export declare const queryAllComponentList: (data: any) => Promise<serverProps<{
     fixedColumns: ColumnsConfigI[];
     nonFixedColumns: ColumnsConfigI[];
 }>>;
+export declare const getPlatList: (data: any) => Promise<serverProps<{
+    all: PlatIProp[];
+    alreadyJoinedList: PlatIProp[];
+    notJoinList: PlatIProp[];
+}>>;

package/dist/esm/model/customizeWorkOrder/api.js

@@ -1,3 +1,15 @@
+function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+
 import request from "../servers/request";
 // 所有组件信息
 export var queryAllComponentList = function queryAllComponentList(data) {
@@ -6,4 +18,18 @@ export var queryAllComponentList = function queryAllComponentList(data) {
     method: 'get',
     data: data
   });
+}; // 平台信息
+
+export var getPlatList = function getPlatList(data) {
+  return request({
+    url: '/qy/platform/listPlatform',
+    method: 'get',
+    data: data
+  }).then(function (res) {
+    var platType = res.data || {};
+    platType.alreadyJoinedList = platType.alreadyJoinedList || [];
+    platType.notJoinList = platType.notJoinList || [];
+    var list = [].concat(_toConsumableArray(platType.alreadyJoinedList), _toConsumableArray(platType.notJoinList));
+    return list;
+  });
 };

package/dist/esm/model/customizeWorkOrder/index.js

@@ -110,7 +110,7 @@ export var fetchAllComponentList = /*#__PURE__*/function () {
             _context2.prev = 0;
             _context2.next = 3;
             return queryAllComponentList({
-              templateId: '74TM7ZQQ7Z2N3754WWBV7ALB' // 这个模板标识是全部工单
+              templateId: 'EHS2XLO7QXHYOR65I6OHQWNY' // 这个模板标识是全部工单
 
             });
 

package/dist/esm/model/customizeWorkOrder/types.d.ts

@@ -35,3 +35,8 @@ export declare type ComponentColumnsT = {
     uniqueKey: string;
     name: string;
 };
+export declare type PlatIProp = {
+    alreadyJoin: boolean;
+    img: string;
+    platformType: number;
+};

package/dist/esm/model/workOrder.d.ts

@@ -1,6 +1,7 @@
 export interface WorkOrderState {
     groupAllList: [];
     groupTemplateList: any[];
+    enabledTemplateList: string[];
     allTempLateList: any[];
     orderList: any[];
     orderListTotal: number;

package/dist/esm/model/workOrder.js

@@ -39,6 +39,8 @@ var initialState = {
   //模版组列表包含模版
   groupTemplateList: [],
   //模版组列表 不包含模版
+  enabledTemplateList: [],
+  //禁用组件模版列表
   allTempLateList: [],
   //组列表下的模版
   orderList: [],
@@ -266,6 +268,7 @@ export var workOrderSlice = createSlice({
       var list = action.payload;
       var groupList = [];
       var tempList = [];
+      var enabledTemplateList = [];
       var groupAllList = list.reduce(function (prv, item) {
         if (item.workOrderTemplates.length) {
           var groupId = item.groupId,
@@ -282,6 +285,8 @@ export var workOrderSlice = createSlice({
 
             if (t.enabled) {
               tempList.push(t);
+            } else {
+              enabledTemplateList.push(t.uniqueKey);
             }
 
             return t.enabled;
@@ -296,6 +301,7 @@ export var workOrderSlice = createSlice({
         return prv;
       }, []);
       state.groupAllList = groupAllList;
+      state.enabledTemplateList = enabledTemplateList;
       state.customSearch.tempSelect = (groupAllList === null || groupAllList === void 0 ? void 0 : groupAllList.length) && [(_groupAllList$ = groupAllList[0]) === null || _groupAllList$ === void 0 ? void 0 : _groupAllList$.value, (_groupAllList$2 = groupAllList[0]) === null || _groupAllList$2 === void 0 ? void 0 : (_groupAllList$2$child = _groupAllList$2.children[0]) === null || _groupAllList$2$child === void 0 ? void 0 : _groupAllList$2$child.value];
     }), builder.addCase(fetchQueryWorkOrder.pending, function (state) {
       state.loading = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.4.0-alpha.2",
+  "version": "0.4.0-alpha.20",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.1.2",
+    "@raycloud-apaas-fe-setup/apaas-react-basics-widgets": "^1.1.3-alpha.2",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeFormModal/index.d.ts

@@ -1,17 +0,0 @@
-/// <reference types="react" />
-import 'moment/locale/zh-cn';
-import './index.less';
-declare type CustomizeFormModal = {
-    width?: string;
-    shopList: any[];
-    look?: boolean;
-    templateId: string;
-    shopId: string;
-    orderNo: string;
-    buyerId: string;
-    buyerNick: string;
-    platform: string;
-    onSuccess?: (val: any) => void;
-};
-declare const CustomizeFormModal: (props: CustomizeFormModal) => JSX.Element;
-export default CustomizeFormModal;