@kmkf-fe-packages/kmkf-work-order-service-component 2.0.34 → 2.0.36

package/dist/esm/FlowTemplateDetailV2/components/FormRender/index.js

@@ -1019,14 +1019,17 @@ var FormRender = function FormRender(props, ref) {
         newComponentConfig['disabled'] = disabled || !canModifyPayment;
       }
       if (['RADIO', 'SELECT', 'MULT_SELECT'].includes(workOrderComponentType)) {
-        var _mappingConfig$readon, _mappingConfig$readon2;
-        if (((_mappingConfig$readon = mappingConfig.readonlyComponents[uniqueKey]) === null || _mappingConfig$readon === void 0 ? void 0 : _mappingConfig$readon.auth) === 'all') {
-          newComponentConfig[workOrderComponentType === 'SELECT' ? 'readonly' : 'disabled'] = true;
-        } else if (((_mappingConfig$readon2 = mappingConfig.readonlyComponents[uniqueKey]) === null || _mappingConfig$readon2 === void 0 ? void 0 : _mappingConfig$readon2.auth) === 'single') {
-          newComponentConfig.disabled = true;
-          if (workOrderComponentType === 'RADIO') {
-            // 隐藏未选中组件
-            newComponentConfig.hideUnselectedItem = true;
+        var _mappingConfig$readon;
+        if (!((_mappingConfig$readon = mappingConfig.readonlyComponents[uniqueKey]) !== null && _mappingConfig$readon !== void 0 && _mappingConfig$readon.canEdit)) {
+          var _mappingConfig$readon2, _mappingConfig$readon3;
+          if (((_mappingConfig$readon2 = mappingConfig.readonlyComponents[uniqueKey]) === null || _mappingConfig$readon2 === void 0 ? void 0 : _mappingConfig$readon2.auth) === 'all') {
+            newComponentConfig[workOrderComponentType === 'SELECT' ? 'readonly' : 'disabled'] = true;
+          } else if (((_mappingConfig$readon3 = mappingConfig.readonlyComponents[uniqueKey]) === null || _mappingConfig$readon3 === void 0 ? void 0 : _mappingConfig$readon3.auth) === 'single') {
+            newComponentConfig.disabled = true;
+            if (workOrderComponentType === 'RADIO') {
+              // 隐藏未选中组件
+              newComponentConfig.hideUnselectedItem = true;
+            }
           }
         }
       }

package/dist/esm/common/utils/tools.d.ts

@@ -114,6 +114,7 @@ export declare const getMappingConfigByTemplateDetail: (templateDetail: {
     readonlyComponents: {
         [key: string]: {
             auth: 'single' | 'all';
+            canEdit: boolean;
         };
     };
     hideComponents: string[];

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

@@ -1184,8 +1184,10 @@ export var getMappingConfigByTemplateDetail = function getMappingConfigByTemplat
       }
     }
     if ((_mapping$rules2 = mapping.rules) !== null && _mapping$rules2 !== void 0 && _mapping$rules2.length && mapping.triggerComponentKey) {
+      var _mapping;
       readonlyComponents[componentDto.uniqueKey] = {
-        auth: mapping.auth
+        auth: mapping.auth,
+        canEdit: !!((_mapping = mapping) !== null && _mapping !== void 0 && _mapping.canEdit)
       };
       if (mapping.auth === 'single') {
         hideComponents.push(componentDto.uniqueKey);

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

@@ -1,11 +1,6 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
-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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 import { HasFilterHandle } from "./tools";
-import { jstOrderDetail, bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail, jstOrderOutList } from "../../model/servers/api";
+import { bsOrderDetail, wlnOrderDetail, wdtOrderDetail, bsE3OrderDetail, kmOrderDetail, gyOrderDetail } from "../../model/servers/api";
+import { servers } from '@kmkf-fe-packages/kmkf-utils';
 var orderBackKeyListMap = {
   hasJst: ['JST_SYSTEM_ORDER', 'JST_GOODS', 'JST_REISSUE_GOODS', 'JST_LOGISTICS', 'JST_ITEM_SELECT_THIRD', 'JST_SUPPLY', 'JST_SEND_GOOD'],
   hasBs: ['BS_SIGNING_TIME', 'BS_SEND_TIME', 'BS_TRADE_PAYMENT_TIME', 'BS_NET_RECEIPTS', 'BS_PACKAGE_WEIGHT', 'BS_GOODS', 'BS_DEPOSIT', 'BS_LOGISTICS', 'BS_SEND_GOOD', 'BS_POSTING', 'BS_SYSTEM_ORDER', 'BS_DELIVERY_NO'],
@@ -15,37 +10,6 @@ var orderBackKeyListMap = {
   hasWln: ['WLN_SYSTEM_ORDER', 'WLN_GOODS', 'WLN_LOGISTICS', 'WLN_SEND_GOOD'],
   hasGy: ['GY_SYSTEM_ORDER', 'GY_SEND_GOOD', 'GY_GOODS', 'GY_REISSUE_GOODS']
 };
-
-/**
- * 将订单接口数据转成出库单数据结构
- */
-function jstOrderDetailDataToOrderOutData(res) {
-  return _objectSpread(_objectSpread({}, res), {}, {
-    data: res.data.orders.map(function (order) {
-      return _objectSpread(_objectSpread({}, order), {}, {
-        orderType: order.erpOrderType
-      });
-    })
-  });
-}
-var jstOrderDetailWrap = function jstOrderDetailWrap(soId) {
-  return jstOrderDetail({
-    soId: soId
-  }).then(function (res) {
-    var _res$data, _res$data$orders;
-    if (!(res !== null && res !== void 0 && (_res$data = res.data) !== null && _res$data !== void 0 && (_res$data$orders = _res$data.orders) !== null && _res$data$orders !== void 0 && _res$data$orders.length)) {
-      return jstOrderOutList({
-        soId: soId
-      });
-    }
-    return jstOrderDetailDataToOrderOutData(res);
-  }).catch(function (e) {
-    // console.log('***** in e', e);
-    return jstOrderOutList({
-      soId: soId
-    });
-  });
-};
 export var orderBackMap = function orderBackMap(_ref) {
   var templateDetail = _ref.templateDetail,
     order_no = _ref.order_no;
@@ -54,7 +18,7 @@ export var orderBackMap = function orderBackMap(_ref) {
     hasJst: {
       flag: HasFilterHandle(templateDetail, orderBackKeyListMap.hasJst),
       promiseRequest: function promiseRequest() {
-        return jstOrderDetailWrap(order_no);
+        return servers.JST.jstOrderDetailWrap(order_no);
       }
     },
     //判断是否有百胜组件 有就请求bs订单接口

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

@@ -6,6 +6,7 @@ export declare const selectDeleteCustomizeWorkOrderModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -19,6 +20,7 @@ export declare const selectorDealerModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -32,6 +34,7 @@ export declare const selectorCompanyUserList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").CompanyUserListI[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => import("./types").CompanyUserListI[], {
     clearCache: () => void;
 }> & {
@@ -45,6 +48,7 @@ export declare const selectorSelectedCompanyUserList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string[], {
     clearCache: () => void;
 }> & {
@@ -58,6 +62,7 @@ export declare const selectorModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -71,6 +76,7 @@ export declare const selectorLogModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -84,6 +90,7 @@ export declare const selectorFormModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -97,6 +104,7 @@ export declare const selectorTemplateId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -110,6 +118,7 @@ export declare const selectorLogicFlowId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -123,6 +132,7 @@ export declare const selectorFlowWorkOrderId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -136,6 +146,7 @@ export declare const selectorCurrentShopId: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => string) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => string, {
     clearCache: () => void;
 }> & {
@@ -149,6 +160,7 @@ export declare const selectorCurrentCustomizeRecord: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => any) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => any, {
     clearCache: () => void;
 }> & {
@@ -162,6 +174,7 @@ export declare const selectorCurrentBuyerChecked: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -175,6 +188,7 @@ export declare const selectorAllTemplateList: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").ComponentColumnsT[]) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => import("./types").ComponentColumnsT[], {
     clearCache: () => void;
 }> & {
@@ -188,6 +202,7 @@ export declare const selectRepeatVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -201,6 +216,7 @@ export declare const selectRepeatWorkOrderConditions: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => import("./types").ConditionsT) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => import("./types").ConditionsT, {
     clearCache: () => void;
 }> & {
@@ -214,6 +230,7 @@ export declare const selectCancelInterceptionModalVisible: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {
@@ -227,6 +244,7 @@ export declare const selectShowPayment: ((state: {
     paymentWorkOrder: import("../paymentWorkOrder/types").PaymentWorkOrderState;
     singleWorkOrder: import("../singleShopWorkOrder/types").SingleWorkOrderState;
     logicFlow: import("../logicFlow/types").LogicFlowState;
+    flowWOrkOrderDetail: import("../flowTemplateDetail/types").FlowTemplateDetailState;
 }) => boolean) & import("reselect").OutputSelectorFields<(args_0: import("./types").CustomizeWorkOrderState) => boolean, {
     clearCache: () => void;
 }> & {

package/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@kmkf-fe-packages/kmkf-work-order-service-component",
-  "version": "2.0.34",
+  "version": "2.0.36",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "sync": "yarn build && yalc push",
     "build": "yarn run lint && father build",
     "deploy": "npm run docs:build && npm run docs:deploy",
     "docs:build": "dumi build",
@@ -18,6 +17,7 @@
     "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
     "pub": "npm publish --registry=https://registry.npmjs.org/",
     "start": "dumi dev",
+    "sync": "yarn build && yalc push",
     "test": "umi-test",
     "test:coverage": "umi-test --coverage",
     "watch": "nodemon --ignore dist/ --ignore node_modules/ --watch src/ -C -e ts,tsx,less --debug -x 'yarn async'"
@@ -32,9 +32,9 @@
   },
   "dependencies": {
     "@ant-design/icons": "^4.7.0",
-    "@kmkf-fe-packages/basic-components": "2.0.34",
-    "@kmkf-fe-packages/kmkf-utils": "2.0.34",
-    "@kmkf-fe-packages/services-components": "2.0.34",
+    "@kmkf-fe-packages/basic-components": "2.0.36",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.36",
+    "@kmkf-fe-packages/services-components": "2.0.36",
     "@reduxjs/toolkit": "^1.8.5",
     "ahooks": "^3.7.4",
     "copy-to-clipboard": "^3.3.3",
@@ -73,7 +73,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "00e06f420455b7ea2eedc3ad876607f925af101d",
+  "gitHead": "0d96086e345abce2acf20f0cb4be85add93aa49e",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }