@kmkf-fe-packages/services-components 2.10.9-beta.33 → 2.10.9-beta.34

package/dist/esm/components/Common/index.js

@@ -6,6 +6,11 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 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 _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 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); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure 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); }
@@ -24,7 +29,7 @@ import CopyText from "../../commonComponents/CopyText";
 import { KM_SYSTEM_ORDER_CONFIG, GY_SYSTEM_ORDER_CONFIG, BS_SYSTEM_ORDER_CONFIG, WLN_SYSTEM_ORDER_CONFIG, WDT_SYSTEM_ORDER_CONFIG, BS_E3_SYSTEM_ORDER_CONFIG, JST_SYSTEM_ORDER_CONFIG, JY_SYSTEM_ORDER_CONFIG, JKY_SYSTEM_ORDER_CONFIG, WDT_RETURN_BILL_NO_CONFIG, PLATFORM_AFTER_SALES_ORDER_CONFIG, DXD_SYSTEM_ORDER_CONFIG, TTX_SYSTEM_ORDER_CONFIG, msgTypeCh, getMapping, columnsGoodsList } from "@kmkf-fe-packages/kmkf-utils";
 import { getColumnsMap } from "./constants/columnsBaseInfoMap";
 import { VideoCameraTwoTone } from "@ant-design/icons";
-import { ApaasImage } from "@kmkf-fe-packages/basic-components";
+import { ApaasImage, resolveColumnWidth } from "@kmkf-fe-packages/basic-components";
 var Paragraph = Typography.Paragraph;
 export var getFormItem = function getFormItem(_ref) {
   var name = _ref.name,
@@ -506,7 +511,9 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
         });
         // 如果列应该显示（show不为false）或者有验证器，则返回对应的列配置
         if (currentCol && (col.show !== false || currentCol !== null && currentCol !== void 0 && currentCol.validator)) {
-          return currentCol;
+          return _objectSpread(_objectSpread({}, currentCol), {}, {
+            width: resolveColumnWidth(col.width, currentCol.width)
+          });
         }
         return undefined;
       }).filter(Boolean);
@@ -523,6 +530,11 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
     }].concat(_toConsumableArray(baseInfoColumns));
     return columnList;
   }, [showHeader, list]);
+  var tableScrollX = useMemo(function () {
+    return newColumns.reduce(function (total, column) {
+      return total + (Number(column.width) || 0);
+    }, 0);
+  }, [newColumns]);
   return /*#__PURE__*/React.createElement(Table, {
     columns: newColumns,
     dataSource: list,
@@ -530,7 +542,7 @@ export var BsGoodsTable = function BsGoodsTable(_ref11) {
     size: "small",
     pagination: false,
     scroll: {
-      x: "100%"
+      x: tableScrollX
     },
     locale: {
       emptyText: "暂无数据"

package/dist/esm/components/CommonHeaderGood/index.js

@@ -18,7 +18,7 @@ import ItemView from "../../commonComponents/ItemView";
 import { isNull, BS_E3_BOOLEAN_STATUS_MAP } from "@kmkf-fe-packages/kmkf-utils";
 import { BsHeaderPic, BsHeaderChild } from "../BS/common";
 import ReissueGift from "../BsE3/ReissueGift";
-import { erpColumnsMap } from "@kmkf-fe-packages/basic-components";
+import { erpColumnsMap, resolveColumnWidth } from "@kmkf-fe-packages/basic-components";
 import { getJstColumns, getKmColumns, getDxdColumns, getTtxColumns } from "@kmkf-fe-packages/basic-components";
 var isNullNotFalse = function isNullNotFalse(val) {
   if (val === false) return false;
@@ -2856,11 +2856,15 @@ var CommonHeaderGoods = /*#__PURE__*/function () {
         var _this2$itemKey;
         var headerConfig = GoodHeaderMap[_this2.type].headerMap[key];
         var isStringConfig = typeof headerConfig === "string";
+        var configuredColumn = isObjectArray ? showHeader.find(function (item) {
+          return item.dataIndex === key;
+        }) : undefined;
+        var defaultWidth = isStringConfig ? 80 : headerConfig.width || 80;
         return {
           component: isStringConfig ? BsHeaderChild : headerConfig.component || BsHeaderChild,
           name: isStringConfig ? headerConfig : ((_this2$itemKey = _this2.itemKey) === null || _this2$itemKey === void 0 ? void 0 : _this2$itemKey[key]) || headerConfig.name,
           key: isStringConfig ? key : headerConfig.key || key,
-          width: isStringConfig ? 80 : headerConfig.width || 80,
+          width: resolveColumnWidth(configuredColumn === null || configuredColumn === void 0 ? void 0 : configuredColumn.width, defaultWidth),
           transformValue: isStringConfig ? undefined : headerConfig.transformValue,
           renderExport: isStringConfig ? undefined : headerConfig.renderExport
         };

package/dist/esm/components/PostIng/index.d.ts

@@ -31,7 +31,7 @@ declare class BasicPosting implements ComponentInterface {
     sortColumns: SortColumnsField;
     headerProvince: boolean;
     constructor(options: PickOption);
-    getChildren: () => (City | Detail | District | Province | ReceiverMobile | ReceiverName | undefined)[];
+    getChildren: () => (Province | City | District | Detail | ReceiverName | ReceiverMobile | undefined)[];
     getSortColumns: (sortColumns: string | undefined) => SortColumnsField;
     renderPc: (value: any, record: Record) => React.JSX.Element | null;
     renderLog: (r: Record) => React.JSX.Element | null;

package/dist/esm/factory.d.ts

@@ -1,3 +1,3 @@
 import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicPicturePro, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, DxdShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm, FlowOverallStatusSelect, ReturnWarehouse, KmExchange } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | CommonMultiStatus | JstSendGood | LogisticsInterception | LogisticsMoreInterception | PublicGoods | ERemark | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | DxdShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;
+export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | CommonMultiStatus | JstSendGood | LogisticsInterception | LogisticsMoreInterception | PublicGoods | ERemark | TradeId | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | NodeDeadLine | HandlerDeadLine | NodeStayDuration | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | DxdShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | ReturnWarehouse | GyGoods | KmExchange | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | FlowOverallStatusSelect;

package/dist/esm/type.d.ts

@@ -5,6 +5,7 @@ export declare type ShowHeaderObjType = {
     title: string;
     dataIndex: string;
     show?: boolean;
+    width?: number;
 };
 export declare type DataType = "string" | "number" | "array" | "dateArray" | "date" | "tradeId";
 export declare type ALignType = "left" | "right" | "center";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "2.10.9-beta.33",
+  "version": "2.10.9-beta.34",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "2.10.9-beta.33",
-    "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.33",
+    "@kmkf-fe-packages/basic-components": "2.10.9-beta.34",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.34",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ee1563735f2762334a8f4530cc5f6838857c0c9e",
+  "gitHead": "50f6675508c29e033fb10ce1d240bd6f80c9dd93",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }