@kmkf-fe-packages/services-components 0.8.15-alpha.1 → 0.8.15-alpha.2

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

@@ -14,7 +14,6 @@ import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 import get from 'lodash/get';
 import { SYMBOL } from "../../constant";
 var typeMap = {
-  BUYER_MESSAGE_NOTICE: 'buyerMessageNotice',
   RADIO: 'radio'
 };
 var BasicRadio = /*#__PURE__*/_createClass(function BasicRadio(options) {

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

@@ -6,7 +6,7 @@ declare class BasicSelect implements ComponentInterface {
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface["componentConfig"];
+    componentConfig: ComponentInterface['componentConfig'];
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
@@ -14,6 +14,7 @@ declare class BasicSelect implements ComponentInterface {
     dataType: ComponentInterface['dataType'];
     options: ComponentInterface['options'];
     constructor(options: PickOption);
+    getKeyByComponentType: (type: string) => any;
     editRender: (p: any) => React.JSX.Element;
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: (value: any, record: Record) => React.JSX.Element;

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

@@ -12,6 +12,10 @@ import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
 import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 import { SYMBOL } from "../../constant";
+var typeMap = {
+  BUYER_MESSAGE_NOTICE: 'buyerMessageNotice',
+  SELECT: 'select'
+};
 var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {
   var _this = this,
     _this$componentConfig3;
@@ -28,6 +32,9 @@ var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "options", void 0);
+  _defineProperty(this, "getKeyByComponentType", function (type) {
+    return typeMap[type] || '';
+  });
   _defineProperty(this, "editRender", function (p) {
     var _this$componentConfig, _this$componentConfig2;
     return /*#__PURE__*/React.createElement(GetFormItem, {
@@ -52,25 +59,30 @@ var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {
   });
   _defineProperty(this, "renderPc", function (value, record) {
     var _record;
-    return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_select")]) !== null && _record !== void 0 ? _record : '--');
+    var type = _this.type;
+    return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]) !== null && _record !== void 0 ? _record : '--');
   });
   _defineProperty(this, "renderLog", function (r) {
-    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_select")])) return null;
+    var type = _this.type;
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[type])])) return null;
     return _this.renderPc(undefined, r);
   });
   _defineProperty(this, "getComponentValue", function (r) {
-    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_select")];
+    var type = _this.type;
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(typeMap[type])];
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var _record2;
-    return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_select")]) !== null && _record2 !== void 0 ? _record2 : '--';
+    var type = _this.type;
+    return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(typeMap[type])]) !== null && _record2 !== void 0 ? _record2 : '--';
   });
   _defineProperty(this, "filterConfig", function (item) {
     var _item$config;
+    var key = _this.getKeyByComponentType(item.type);
     return {
       searchDefaultConditions: SYMBOL.in,
       type: item.type,
-      id: "".concat(item.id, "_select"),
+      id: "".concat(item.id, "_").concat(key),
       // 过滤组件id
       name: item.name,
       // 过滤组件名称
@@ -80,15 +92,15 @@ var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {
       },
       filterFn: function filterFn(value) {
         return function (i) {
-          return value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id, 'select'));
+          return value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id, key));
         };
       } // 第一个为选中值，第二个参数为表格行记录值
     };
   });
   this.name = options.name;
   this.id = options.id;
-  this.sortField = "".concat(options.id, "_select");
-  this.formField = "".concat(options.id, "_select");
+  this.sortField = "".concat(options.id, "_").concat(this.getKeyByComponentType(options.type));
+  this.formField = "".concat(options.id, "_").concat(this.getKeyByComponentType(options.type));
   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, ErpTradeId, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => BasicRadio | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ErpTradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | BsGoods | BsExchange | BsReissue | FlowStatusSelect | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | ShopInput | Submitter | Handler | CompletedUser | FlowWorkOrderId;
+export declare const factory: (type: string, options: PickOption) => BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ErpTradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | BsGoods | BsExchange | BsReissue | FlowStatusSelect | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | ShopInput | Submitter | Handler | CompletedUser | FlowWorkOrderId;

package/dist/esm/factory.js

@@ -24,6 +24,7 @@ export var factory = function factory(type, options) {
     case "DATETIME":
       return new BasicDataTime(options);
     case "SELECT":
+    case 'BUYER_MESSAGE_NOTICE':
       return new BasicSelect(options);
     case "PICTURE":
       return new BasicPicture(options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.8.15-alpha.1",
+  "version": "0.8.15-alpha.2",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "7dfa5c1a4e86ef9ab482cd3dd611eb41e7ac2400"
+  "gitHead": "df18be404ad2cdf504f587b5c375d980bff1f8f7"
 }