@kmkf-fe-packages/services-components 2.0.18 → 2.0.19-beta.0

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

@@ -22,6 +22,9 @@ var typeMap = {
   NEW_PAYMENT_STATUS: {
     key: "newPaymentStatus",
     placeholder: "自动获取无需填写"
+  },
+  ORDER_TYPE: {
+    key: "erpOrderType"
   }
 };
 var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {
@@ -54,7 +57,7 @@ var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
       required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
-      tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : '',
+      tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : "",
       component: /*#__PURE__*/React.createElement(ApaasSelect, _extends({}, _this.componentConfig, {
         placeholder: typeMap[_this.type].placeholder || "\u8BF7\u8F93\u5165".concat(_this.name),
         showSearch: true,
@@ -65,7 +68,7 @@ var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {
   _defineProperty(this, "renderClient", function (record) {
     var _this$componentConfig5, _this$optionsMap;
     // 特殊自定义组件为平台状态时匹配出label
-    var label = ((_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.webUniqueKey) === 'PLATFORM_STATUS' ? (_this$optionsMap = _this.optionsMap) === null || _this$optionsMap === void 0 ? void 0 : _this$optionsMap[record === null || record === void 0 ? void 0 : record[_this.id]] : record === null || record === void 0 ? void 0 : record[_this.id];
+    var label = ((_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.webUniqueKey) === "PLATFORM_STATUS" ? (_this$optionsMap = _this.optionsMap) === null || _this$optionsMap === void 0 ? void 0 : _this$optionsMap[record === null || record === void 0 ? void 0 : record[_this.id]] : record === null || record === void 0 ? void 0 : record[_this.id];
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
@@ -77,7 +80,7 @@ var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {
     var type = _this.type;
     var key = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type].key)];
     // 特殊自定义组件为平台状态时匹配出label
-    var label = ((_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.webUniqueKey) === 'PLATFORM_STATUS' ? ((_this$optionsMap2 = _this.optionsMap) === null || _this$optionsMap2 === void 0 ? void 0 : _this$optionsMap2[key]) || '' : key;
+    var label = ((_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.webUniqueKey) === "PLATFORM_STATUS" ? ((_this$optionsMap2 = _this.optionsMap) === null || _this$optionsMap2 === void 0 ? void 0 : _this$optionsMap2[key]) || "" : key;
     return /*#__PURE__*/React.createElement("span", null, label !== null && label !== void 0 ? label : "--");
   });
   _defineProperty(this, "renderLog", function (r) {
@@ -94,11 +97,11 @@ var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {
     var type = _this.type;
     var key = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type].key)];
     // 特殊自定义组件为平台状态时匹配出label
-    var label = ((_this$componentConfig7 = _this.componentConfig) === null || _this$componentConfig7 === void 0 ? void 0 : _this$componentConfig7.webUniqueKey) === 'PLATFORM_STATUS' ? ((_this$optionsMap3 = _this.optionsMap) === null || _this$optionsMap3 === void 0 ? void 0 : _this$optionsMap3[key]) || '' : key;
+    var label = ((_this$componentConfig7 = _this.componentConfig) === null || _this$componentConfig7 === void 0 ? void 0 : _this$componentConfig7.webUniqueKey) === "PLATFORM_STATUS" ? ((_this$optionsMap3 = _this.optionsMap) === null || _this$optionsMap3 === void 0 ? void 0 : _this$optionsMap3[key]) || "" : key;
     return label !== null && label !== void 0 ? label : "--";
   });
   _defineProperty(this, "filterConfig", function (item) {
-    var _item$config;
+    var _item$config, _item$templateConfig;
     var key = _this.getKeyByComponentType(item.type);
     return {
       searchDefaultConditions: SYMBOL.in,
@@ -109,7 +112,7 @@ var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {
       // 过滤组件名称
       filterComponentType: "MultipleSelect",
       props: {
-        options: (item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.options) || []
+        options: (item === null || item === void 0 ? void 0 : (_item$config = item.config) === null || _item$config === void 0 ? void 0 : _item$config.options) || (item === null || item === void 0 ? void 0 : (_item$templateConfig = item.templateConfig) === null || _item$templateConfig === void 0 ? void 0 : _item$templateConfig.options) || []
       },
       filterFn: function filterFn(value) {
         return function (i) {

package/dist/esm/factory.d.ts

@@ -1,3 +1,3 @@
-import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, 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, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel } from "./index";
+import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, 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, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => JstSendGood | LogisticsInterception | LogisticsMoreInterception | MsgStatus | BasicSelect | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicRadio | BasicTextArea | BasicPicture | 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 | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsSystemOrder | BsGoods | BsE3Goods | PublicGoods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | GyGoods | GyReissue;
+export declare const factory: (type: string, options: PickOption) => GyReissue | GyReturn | JstSendGood | Label | LogisticsInterception | LogisticsMoreInterception | MsgStatus | BasicSelect | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicRadio | BasicTextArea | BasicPicture | 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 | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsSystemOrder | BsGoods | BsE3Goods | PublicGoods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | MemberLevel | AfterSalesOrderId | GyGoods;

package/dist/esm/factory.js

@@ -1,6 +1,6 @@
 import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, SubForm, CommonDataTime, TradeId, ShopName, ErpTradeId, 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,
 // CommonTradeId,
-CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel } from "./index";
+CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn } from "./index";
 export var factory = function factory(type, options) {
   var _options$componentCon;
   switch (type) {
@@ -31,6 +31,7 @@ export var factory = function factory(type, options) {
     case "SELECT":
     case "BUYER_MESSAGE_NOTICE":
     case "NEW_PAYMENT_STATUS":
+    case "ORDER_TYPE":
       return new BasicSelect(options);
     case "PICTURE":
       return new BasicPicture(options);
@@ -174,6 +175,8 @@ export var factory = function factory(type, options) {
       return new BsReturn(options);
     case "WDT_RETURN_GOODS":
       return new WdtReturn(options);
+    case "GY_RETURN_GOODS":
+      return new GyReturn(options);
     case "JST_RETURN_GOODS":
       return new PublicReissueGoods(options);
     case "REISSUE_TRADE_ID":

package/dist/esm/index.d.ts

@@ -91,6 +91,7 @@ export { default as KmErpSendGood } from "./components/KmErpSendGood";
 export { default as AfterSalesOrderId } from "./components/AfterSalesOrderId";
 export { default as GyGoods } from "./components/GY/GyGoods";
 export { default as GyReissue } from "./components/GY/GyReissue";
+export { default as GyReturn } from "./components/GY/GyReturn";
 export { default as KmErpOrderNum } from "./components/ErpTradeId/components/OrderNum";
 export { factory } from "./factory";
 export { default as PlatformAvatar } from "./commonComponents/PlatformAvatar";

package/dist/esm/index.js

@@ -91,6 +91,7 @@ export { default as KmErpSendGood } from "./components/KmErpSendGood";
 export { default as AfterSalesOrderId } from "./components/AfterSalesOrderId";
 export { default as GyGoods } from "./components/GY/GyGoods";
 export { default as GyReissue } from "./components/GY/GyReissue";
+export { default as GyReturn } from "./components/GY/GyReturn";
 // TODO: ERP 打款工单使用
 export { default as KmErpOrderNum } from "./components/ErpTradeId/components/OrderNum";
 export { factory } from "./factory";

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "2.0.18",
+  "version": "2.0.19-beta.0",
   "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",
     "lint": "eslint '**/*.{ts,tsx}'",
-    "lint:fix": "eslint --fix '**/*.{ts,tsx}'"
+    "lint:fix": "eslint --fix '**/*.{ts,tsx}'",
+    "sync": "yarn build && yalc push"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "2.0.18",
-    "@kmkf-fe-packages/kmkf-utils": "2.0.18",
+    "@kmkf-fe-packages/basic-components": "2.0.19-beta.0",
+    "@kmkf-fe-packages/kmkf-utils": "2.0.19-beta.0",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6b9ac6412c233e92616caf732da997ece8ae946e",
+  "gitHead": "336ada02cb6f2c70056928879798475bf880d389",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }