kmkf-work-order-service-component 0.3.9-alpha.1 → 0.4.0-alpha.1

package/dist/esm/FormRender/index.less

@@ -0,0 +1,134 @@
+.customizeFormModalWrapper {
+  p,
+  lable {
+    font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, 'Helvetica Neue', Arial,
+      'Noto Sans', sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol',
+      'Noto Color Emoji';
+  }
+  .ant-modal-body {
+    overflow-x: hidden;
+    overflow-y: auto;
+  }
+  .ant-select.ant-select-single.ant-select-show-arrow.ant-select-show-search {
+    margin-bottom: 8px;
+  }
+  .ant-picker-suffix,
+  .ant-select-arrow svg {
+    color: #4e5969;
+  }
+  .status-payment--basic {
+    .ant-row.ant-form-item {
+      margin-bottom: 5px;
+    }
+  }
+  .ant-modal-footer {
+    margin-top: 20px;
+  }
+  .ant-input[disabled],
+  .ant-input-number-disabled {
+    border: none;
+  }
+  .ant-select-disabled .ant-select-arrow svg {
+    color: #c9cdd4;
+  }
+}
+
+.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-weight: bold;
+    font-size: 14px;
+    white-space: normal;
+    text-align: left;
+  }
+
+  :global(.form-item-label--index .ant-form-item-label label) {
+    // padding-left: 23px;
+    text-align: left;
+    // font-family: 'PingFangSC-Semibold';
+
+    // &[title='处理客服'] {
+    //   padding-left: 0;
+    //   font-weight: lighter;
+    //   font-family: 'PingFangSC-Regular';
+    // }
+  }
+
+  :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';
+  }
+}
+
+.tipBox {
+  position: sticky;
+  top: -24px;
+  z-index: 1;
+  color: #e99d42;
+  background-color: #fff;
+}

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

@@ -671,8 +671,6 @@ var CustomizeFormModal = function CustomizeFormModal(props) {
             span: 18
           },
           className: "customizeFormModalClassName",
-          style: {// maxHeight: '500px',
-          },
           children: finalFormItems
         })]
       })

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

@@ -26,11 +26,12 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React from 'react';
 import { Divider } from 'antd';
 import moment from 'moment';
-import { useAppDispatch } from "../../../../../model/hooks";
+import { useAppDispatch, useAppSelector } from "../../../../../model/hooks";
 import { factory } from "../../../Widget";
 import { calcWorkOrderList, isNull } from "../../../../../common/utils/tools";
 import { WORK_ORDER_STATUS, WAITING, HANDLING, STOPPING } from "../../../../../common/constant";
 import { setStatusSelectModalVisible, setLogModalVisible, setFormModalVisible, setTemplateId, setCustomizeFormShopId, setCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder";
+import { selectorAllTemplateList } from "../../../../../model/customizeWorkOrder/selector";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -41,7 +42,7 @@ function CustomizeWorkOrderCard(props) {
 
   var item = props.item;
   var dispatch = useAppDispatch();
-  var componentDtoList = item.templateDetailDto.componentDtoList;
+  var componentDtoList = useAppSelector(selectorAllTemplateList);
 
   var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], componentDtoList),
       _calcWorkOrderList2 = _slicedToArray(_calcWorkOrderList, 1),
@@ -51,7 +52,8 @@ function CustomizeWorkOrderCard(props) {
   var ItemHeader = function ItemHeader() {
     var _WORK_ORDER_STATUS, _WORK_ORDER_STATUS2;
 
-    var templateDetailDto = item.templateDetailDto,
+    var templateName = item.templateName,
+        flowStatus = item.flowStatus,
         jsonMap = item.jsonMap;
     return /*#__PURE__*/_jsx("div", {
       className: "orderItem",
@@ -63,12 +65,12 @@ function CustomizeWorkOrderCard(props) {
             className: "orderItemLeftIcon"
           }), /*#__PURE__*/_jsxs("div", {
             className: "orderItemLeftName",
-            children: [templateDetailDto ? templateDetailDto.name : '', (jsonMap === null || jsonMap === void 0 ? void 0 : jsonMap.flowStatus) && /*#__PURE__*/_jsx("span", {
+            children: [templateName, flowStatus && /*#__PURE__*/_jsx("span", {
               className: "status",
               style: {
-                background: (_WORK_ORDER_STATUS = WORK_ORDER_STATUS[jsonMap === null || jsonMap === void 0 ? void 0 : jsonMap.flowStatus]) === null || _WORK_ORDER_STATUS === void 0 ? void 0 : _WORK_ORDER_STATUS.bgColor
+                background: (_WORK_ORDER_STATUS = WORK_ORDER_STATUS[flowStatus]) === null || _WORK_ORDER_STATUS === void 0 ? void 0 : _WORK_ORDER_STATUS.bgColor
               },
-              children: (_WORK_ORDER_STATUS2 = WORK_ORDER_STATUS[jsonMap === null || jsonMap === void 0 ? void 0 : jsonMap.flowStatus]) === null || _WORK_ORDER_STATUS2 === void 0 ? void 0 : _WORK_ORDER_STATUS2.label
+              children: (_WORK_ORDER_STATUS2 = WORK_ORDER_STATUS[flowStatus]) === null || _WORK_ORDER_STATUS2 === void 0 ? void 0 : _WORK_ORDER_STATUS2.label
             })]
           })]
         })
@@ -106,7 +108,7 @@ function CustomizeWorkOrderCard(props) {
     var handleEdit = function handleEdit(record) {
       dispatch(setCurrentCustomizeRecord(record));
       dispatch(setFormModalVisible(true));
-      dispatch(setTemplateId(item.templateDetailDto.uniqueKey));
+      dispatch(setTemplateId(record.templateId));
       dispatch(setCustomizeFormShopId(item.shopId));
     };
 

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

@@ -1,3 +1,5 @@
 /// <reference types="react" />
-declare const DealerSelectModal: () => JSX.Element;
+declare const DealerSelectModal: ({ onSuccess }: {
+    onSuccess: () => void;
+}) => JSX.Element;
 export default DealerSelectModal;

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

@@ -12,11 +12,11 @@ import { useSelector, useDispatch } from 'react-redux';
 import { debounce } from 'lodash';
 import { setSelectedUserList, setDealerModalVisible, setCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder";
 import { selectorDealerModalVisible, selectorCompanyUserList, selectorSelectedCompanyUserList, selectorCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder/selector";
-import { fetchQueryWorkOrder } from "../../../../../model/workOrder";
 import { appointTo } from "../../../../../model/servers/api";
 import { jsx as _jsx } from "react/jsx-runtime";
 
-var DealerSelectModal = function DealerSelectModal() {
+var DealerSelectModal = function DealerSelectModal(_ref) {
+  var onSuccess = _ref.onSuccess;
   var visible = useSelector(selectorDealerModalVisible);
   var companyUserList = useSelector(selectorCompanyUserList);
   var record = useSelector(selectorCurrentCustomizeRecord);
@@ -43,7 +43,7 @@ var DealerSelectModal = function DealerSelectModal() {
 
 
   var handleAppointTo = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$appointTo, success, errMsg;
 
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -74,7 +74,7 @@ var DealerSelectModal = function DealerSelectModal() {
                 message.success('转交成功');
                 dispatch(setDealerModalVisible(false));
                 dispatch(setSelectedUserList([]));
-                dispatch(fetchQueryWorkOrder());
+                onSuccess();
               } else {
                 message.error(errMsg);
               }
@@ -88,7 +88,7 @@ var DealerSelectModal = function DealerSelectModal() {
     }));
 
     return function handleAppointTo() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();
 

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

@@ -1,3 +1,5 @@
 /// <reference types="react" />
-declare const DeleteCustomizeOrderModal: () => JSX.Element;
+declare const DeleteCustomizeOrderModal: ({ submit }: {
+    submit: () => void;
+}) => JSX.Element;
 export default DeleteCustomizeOrderModal;

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

@@ -2,12 +2,6 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -26,18 +20,16 @@ import React, { useCallback } from 'react';
 import { Modal } from 'antd';
 import { useSelector } from 'react-redux';
 import { debounce } from 'lodash';
-import { useAppSelector, useAppDispatch } from "../../../../../model/hooks";
+import { useAppDispatch } from "../../../../../model/hooks";
 import { fetchDeleteWorkOrder } from "../../../../../model/workOrder";
 import { setCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder";
 import { selectDeleteCustomizeWorkOrderModalVisible, selectorCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder/selector";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 
-var DeleteCustomizeOrderModal = function DeleteCustomizeOrderModal() {
+var DeleteCustomizeOrderModal = function DeleteCustomizeOrderModal(_ref) {
+  var submit = _ref.submit;
   var dispatch = useAppDispatch();
-  var customSearch = useAppSelector(function (state) {
-    return state.workOrder.customSearch;
-  });
   var deleteCustomizeWorkOrderModalVisible = useSelector(selectDeleteCustomizeWorkOrderModalVisible);
   var record = useSelector(selectorCurrentCustomizeRecord);
 
@@ -50,8 +42,6 @@ var DeleteCustomizeOrderModal = function DeleteCustomizeOrderModal() {
   };
 
   var onDelete = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _record$templateDetai;
-
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
@@ -59,37 +49,27 @@ var DeleteCustomizeOrderModal = function DeleteCustomizeOrderModal() {
             _context.prev = 0;
             _context.next = 3;
             return dispatch(fetchDeleteWorkOrder({
-              uniqueKey: record === null || record === void 0 ? void 0 : (_record$templateDetai = record.templateDetailDto) === null || _record$templateDetai === void 0 ? void 0 : _record$templateDetai.uniqueKey,
+              uniqueKey: record === null || record === void 0 ? void 0 : record.templateId,
               workOrderId: record === null || record === void 0 ? void 0 : record.id
             })).unwrap();
 
           case 3:
-            _context.next = 5;
-            return dispatch({
-              type: 'workOrder/setState',
-              payload: {
-                customSearch: _objectSpread(_objectSpread({}, customSearch), {}, {
-                  pageNo: 1
-                })
-              }
-            });
-
-          case 5:
+            submit();
             handleCancel();
-            _context.next = 11;
+            _context.next = 10;
             break;
 
-          case 8:
-            _context.prev = 8;
+          case 7:
+            _context.prev = 7;
             _context.t0 = _context["catch"](0);
             console.log('e', _context.t0);
 
-          case 11:
+          case 10:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[0, 8]]);
+    }, _callee, null, [[0, 7]]);
   })), [record]);
   return /*#__PURE__*/_jsx(Modal, {
     title: "\u5220\u9664\u5DE5\u5355",

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

@@ -42,7 +42,7 @@ import { useSelector, useDispatch } from 'react-redux';
 import { factory } from "../../../Widget";
 import { calcWorkOrderList, jsonParseSecurity } from "../../../../../common/utils/tools";
 import { reportLogs } from "../../../../../model/servers/api";
-import { selectorLogModalVisible, selectorCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder/selector";
+import { selectorLogModalVisible, selectorCurrentCustomizeRecord, selectorAllTemplateList } from "../../../../../model/customizeWorkOrder/selector";
 import { setLogModalVisible } from "../../../../../model/customizeWorkOrder";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -67,6 +67,7 @@ var RecordLog = function RecordLog(props) {
   var dispatch = useDispatch();
   var visible = useSelector(selectorLogModalVisible);
   var currentRecord = useSelector(selectorCurrentCustomizeRecord);
+  var componentDtoList = useSelector(selectorAllTemplateList);
   useEffect(function () {
     if (visible) {
       getLog(currentRecord);
@@ -151,8 +152,6 @@ var RecordLog = function RecordLog(props) {
         }
       } else if (/^(UPDATE|ADD)/.test(record.operation)) {
         if (/^\[.+\]$/.test(value)) {
-          var _currentRecord$templa, _currentRecord$templa2;
-
           var newContent = jsonParseSecurity(value, []).reduce(function (nxt, cur) {
             nxt[cur['uniqueKey']] = cur['content'];
             return nxt;
@@ -162,7 +161,7 @@ var RecordLog = function RecordLog(props) {
             return nxt;
           }, {});
           var currentNeedContentId = Object.keys(newContent);
-          var newTemplateColumns = currentRecord === null || currentRecord === void 0 ? void 0 : (_currentRecord$templa = currentRecord.templateDetailDto) === null || _currentRecord$templa === void 0 ? void 0 : (_currentRecord$templa2 = _currentRecord$templa.componentDtoList) === null || _currentRecord$templa2 === void 0 ? void 0 : _currentRecord$templa2.filter(function (item) {
+          var newTemplateColumns = componentDtoList === null || componentDtoList === void 0 ? void 0 : componentDtoList.filter(function (item) {
             return currentNeedContentId.findIndex(function (id) {
               return id === null || id === void 0 ? void 0 : id.startsWith(item === null || item === void 0 ? void 0 : item.uniqueKey);
             }) > -1;

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

@@ -1,3 +1,5 @@
 /// <reference types="react" />
-declare const StatusSelectModal: () => JSX.Element;
+declare const StatusSelectModal: ({ onSuccess }: {
+    onSuccess: () => void;
+}) => JSX.Element;
 export default StatusSelectModal;

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

@@ -24,7 +24,6 @@ import { useSelector, useDispatch } from 'react-redux';
 import { debounce, isEmpty, isEqual } from 'lodash';
 import { selectorModalVisible, selectorCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder/selector";
 import { setStatusSelectModalVisible, setCurrentCustomizeRecord } from "../../../../../model/customizeWorkOrder";
-import { fetchQueryWorkOrder } from "../../../../../model/workOrder";
 import { WAITING, HANDLING, STOPPING, COMPLETED } from "../../../../../common/constant";
 import every from 'lodash/every';
 import get from 'lodash/get';
@@ -73,7 +72,8 @@ var checkPaymentStatusByList = function checkPaymentStatusByList(list) {
   });
 };
 
-var StatusSelectModal = function StatusSelectModal() {
+var StatusSelectModal = function StatusSelectModal(_ref) {
+  var onSuccess = _ref.onSuccess;
   var dispatch = useDispatch();
 
   var _useState = useState(''),
@@ -119,7 +119,7 @@ var StatusSelectModal = function StatusSelectModal() {
   };
 
   var handleAppointTo = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var params, _yield$updateFlowStat, success, errMsg;
 
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -150,7 +150,7 @@ var StatusSelectModal = function StatusSelectModal() {
               if (success) {
                 message.success('状态设置成功');
                 handleCancel();
-                dispatch(fetchQueryWorkOrder());
+                onSuccess();
               } else {
                 message.error(errMsg);
               }
@@ -164,7 +164,7 @@ var StatusSelectModal = function StatusSelectModal() {
     }));
 
     return function handleAppointTo() {
-      return _ref.apply(this, arguments);
+      return _ref2.apply(this, arguments);
     };
   }();