@kmkf-fe-packages/services-components 1.0.5-rc.1 → 1.0.6-rc.0

package/dist/esm/commonComponents/GlobalContext/index.js

@@ -39,11 +39,11 @@ var Global = function Global(_ref) {
               queryExpressInterceptData: queryExpressInterceptData,
               queryLogisticsAddressData: queryLogisticsAddressData,
               queryPlatData: queryPlatData,
-              queryWdtAddressData: servers.queryWdtAddressData,
               queryAllLogisticsCompany: queryAllLogisticsCompany,
+              queryLabel: queryLabel,
+              queryWdtAddressData: servers.queryWdtAddressData,
               queryWdtLogisticsCompany: queryWdtLogisticsCompany,
-              queryWdtSendData: queryWdtSendData,
-              queryLabel: queryLabel
+              queryWdtSendData: queryWdtSendData
             };
             mergeMapping = _objectSpread(_objectSpread({}, mapping), repeatRequestList);
             promises = [];

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

@@ -19,7 +19,12 @@ declare class Label implements ComponentInterface {
     getComponentValue: (r: Record) => any;
     editRender: (p: any) => React.JSX.Element;
     renderClient: (record: any) => React.JSX.Element | null;
-    showDetail: (value: Array<string>) => React.JSX.Element;
+    showDetail: (value: Array<{
+        labelId: string;
+        labelName: string;
+        labelShowName: string;
+        openId: string;
+    }>) => React.JSX.Element;
     renderPc: (value: any, record: Record) => React.JSX.Element;
     renderLog: (r: Record) => React.JSX.Element;
     renderExport: (value: any, record: Record) => any;

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

@@ -12,6 +12,7 @@ import { LabelData, isNull } from "@kmkf-fe-packages/kmkf-utils";
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
 var EditRenderItem = function EditRenderItem(props) {
+  var value = props.value;
   var tagRender = function tagRender(prop) {
     var _props$options, _props$options$find;
     var label = prop.label,
@@ -36,6 +37,9 @@ var EditRenderItem = function EditRenderItem(props) {
     }, label);
   };
   return /*#__PURE__*/React.createElement(Select, _extends({}, props, {
+    value: Array.from(new Set(value === null || value === void 0 ? void 0 : value.map(function (item) {
+      return item === null || item === void 0 ? void 0 : item.labelShowName;
+    }))),
     mode: "multiple",
     showArrow: true,
     tagRender: tagRender
@@ -94,7 +98,7 @@ var Label = /*#__PURE__*/_createClass(function Label(options) {
     }, Array.isArray(value) ? value === null || value === void 0 ? void 0 : value.map(function (v) {
       var _this$labelDateInstan;
       var label = ((_this$labelDateInstan = _this.labelDateInstance.labelData) === null || _this$labelDateInstan === void 0 ? void 0 : _this$labelDateInstan.find(function (item) {
-        return item.value === v;
+        return item.value === (v === null || v === void 0 ? void 0 : v.labelShowName);
       })) || {};
       if (!isNull(label)) return /*#__PURE__*/React.createElement(Tag, {
         color: label === null || label === void 0 ? void 0 : label.color
@@ -109,8 +113,10 @@ var Label = /*#__PURE__*/_createClass(function Label(options) {
     return _this.renderPc(undefined, r);
   });
   _defineProperty(this, "renderExport", function (value, record) {
-    var _record;
-    return record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id, "_label")]) === null || _record === void 0 ? void 0 : _record.join('、');
+    var _record, _record$map;
+    return record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id, "_label")]) === null || _record === void 0 ? void 0 : (_record$map = _record.map(function (item) {
+      return item === null || item === void 0 ? void 0 : item.labelShowName;
+    })) === null || _record$map === void 0 ? void 0 : _record$map.join('、');
   });
   _defineProperty(this, "filterConfig", function (item) {
     return [];
@@ -118,7 +124,7 @@ var Label = /*#__PURE__*/_createClass(function Label(options) {
   this.name = options.name;
   this.id = options.id;
   this.sortField = options.id;
-  this.formField = options.id;
+  this.formField = "".concat(options.id, "_label");
   this.type = options.type;
   this.componentConfig = options.componentConfig;
   this.rules = [];

package/dist/esm/factory.d.ts

@@ -1,3 +1,3 @@
-import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, 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, CommonInput, PaymentVoucherCode, WdtReissue, Label } from "./index";
+import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, 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, CommonInput, PaymentVoucherCode, Label, WdtReissue } from "./index";
 import { PickOption } from "./type";
 export declare const factory: (type: string, options: PickOption) => AliPay | BsLogistics | BsReissue | JstLogistics | JstSendGood | Label | LogisticsInterception | WdtReissue | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstItemSelect | JstSupply | BsSystemOrder | BsGoods | BsExchange | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | CommonInput | PaymentVoucherCode;

package/dist/esm/factory.js

@@ -1,6 +1,6 @@
 import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, 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, CommonInput, PaymentVoucherCode, WdtReissue, Label } from "./index";
+CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, CommonInput, PaymentVoucherCode, Label, WdtReissue } from "./index";
 export var factory = function factory(type, options) {
   var _options$componentCon;
   switch (type) {

package/dist/esm/service/api.js

@@ -10,7 +10,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { AddressData, toTree, BsAddressData, WdtAddressData, PlatData, ExpressInterceptData, LogisticsAddressData, ExpressData, WdtSendData, servers, WDT, LabelData } from "@kmkf-fe-packages/kmkf-utils";
+import { AddressData, toTree, BsAddressData, WdtAddressData, PlatData, ExpressInterceptData, LogisticsAddressData, ExpressData, LabelData, WdtSendData, servers, WDT } from "@kmkf-fe-packages/kmkf-utils";
 import get from "lodash/get";
 import request from "./request";
 // 重复校验

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "1.0.5-rc.1",
+  "version": "1.0.6-rc.0",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -20,8 +20,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^1.0.5-rc.1",
-    "@kmkf-fe-packages/kmkf-utils": "^1.0.5-rc.0"
+    "@kmkf-fe-packages/basic-components": "^1.0.6-rc.0",
+    "@kmkf-fe-packages/kmkf-utils": "^1.0.6-rc.0"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.59.2",
@@ -37,7 +37,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "0a562034b4786ad102fd408e07be073dd1e9d616",
+  "gitHead": "5b2c23c0d040d074e8e55d1fe90d81df1998afee",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }