@kmkf-fe-packages/services-components 2.10.9-beta.8 → 2.10.9-beta.81

package/dist/esm/components/Public/Exchange/index.d.ts

@@ -1,7 +1,7 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../../type';
-import React from 'react';
-import CommonHeaderGoods from '../../CommonHeaderGood';
-import type { FormInstance } from 'antd';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../../type";
+import React from "react";
+import CommonHeaderGoods from "../../CommonHeaderGood";
+import type { FormInstance } from "antd";
 declare type ConfigType = {
     goodsKey: string;
     validator: any;
@@ -12,17 +12,24 @@ declare class Exchange implements ComponentInterface {
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface['componentConfig'];
-    effects: ComponentInterface['effects'];
+    componentConfig: ComponentInterface["componentConfig"];
+    effects: ComponentInterface["effects"];
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface['dataType'];
+    dataType: ComponentInterface["dataType"];
+    sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
     returnGoods: CommonHeaderGoods;
     config: ConfigType;
     form?: FormInstance;
     constructor(options: PickOption);
+    getSortChildFields: () => {
+        name: any;
+        key: string;
+        dataType: string;
+        conditionOptionsSetting: any;
+    }[];
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;
     renderLog: (r: Record) => React.JSX.Element;

package/dist/esm/components/Public/Exchange/index.js

@@ -8,28 +8,29 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 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 React from 'react';
+import React from "react";
 import GetFormItem from "../../GetFormItem";
 import { BsGoodsTable } from "../../Common";
 import ItemView from "../../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL } from "../../../constant";
 // import { BsType, BsMemo } from "../../Bs/common";
-import { CommonExchangeGoods } from '@kmkf-fe-packages/basic-components';
+import { CommonExchangeGoods } from "@kmkf-fe-packages/basic-components";
 import CommonHeaderGoods from "../../CommonHeaderGood";
 import { erpFormValidator } from "@kmkf-fe-packages/basic-components";
+import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 function toNum(value) {
-  if (typeof value === 'string') {
+  if (typeof value === "string") {
     return value ? +value : void 0;
   }
-  if (typeof value === 'number') {
+  if (typeof value === "number") {
     return value;
   }
   return void 0;
 }
 var CONF_MAP = {
   JST_EXCHANGE_GOODS: {
-    goodsKey: 'jstExchangeGoods',
+    goodsKey: "jstExchangeGoods",
     validator: function validator(_rule, value, type) {
       if (!_rule.required) return Promise.resolve();
       var validatorFlag = erpFormValidator(_rule, value, type);
@@ -58,12 +59,16 @@ var Exchange = /*#__PURE__*/_createClass(function Exchange(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "returnGoods", void 0);
   _defineProperty(this, "config", void 0);
   _defineProperty(this, "form", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    return getGoodsSortChildFields(_this.type, _this.id);
+  });
   _defineProperty(this, "renderClient", function (record) {
     var _this$componentConfig;
-    var exchangeGoods = JSON.parse((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(_this.config.goodsKey)]) || '[]');
+    var exchangeGoods = JSON.parse((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(_this.config.goodsKey)]) || "[]");
     return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemView, {
       id: "".concat(_this.id, "-out"),
       label: "".concat(_this.name, "-\u6362\u51FA"),
@@ -100,7 +105,7 @@ var Exchange = /*#__PURE__*/_createClass(function Exchange(options) {
       required: false,
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
-      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(CommonExchangeGoods, _extends({}, _this.componentConfig, {
         maxLength: ((_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.maxLength) || 20,
         shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
@@ -118,7 +123,7 @@ var Exchange = /*#__PURE__*/_createClass(function Exchange(options) {
       type: item.type,
       id: "".concat(item.id, "_").concat(_this.config.goodsKey),
       name: "".concat(_this.name, "-\u6362\u51FA"),
-      filterComponentType: 'Input'
+      filterComponentType: "Input"
     }];
   });
   this.name = options.name;
@@ -133,7 +138,7 @@ var Exchange = /*#__PURE__*/_createClass(function Exchange(options) {
   this.form = (_options$effects = options.effects) === null || _options$effects === void 0 ? void 0 : _options$effects.form;
   this.returnGoods = new CommonHeaderGoods(_objectSpread(_objectSpread({}, options), {}, {
     id: "".concat(options.id, "_").concat(this.config.goodsKey),
-    name: '商品信息'
+    name: "商品信息"
   }));
   this.children = [this.returnGoods];
   this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
@@ -142,7 +147,7 @@ var Exchange = /*#__PURE__*/_createClass(function Exchange(options) {
     validator: function validator(_, value) {
       var _this$componentConfig7, _value$_this$config$g;
       if ((_this$componentConfig7 = _this.componentConfig) !== null && _this$componentConfig7 !== void 0 && _this$componentConfig7.required && !(value !== null && value !== void 0 && (_value$_this$config$g = value[_this.config.goodsKey]) !== null && _value$_this$config$g !== void 0 && _value$_this$config$g.length)) {
-        return Promise.reject(new Error('请选择换货商品'));
+        return Promise.reject(new Error("请选择换货商品"));
       }
       return Promise.resolve();
     }
@@ -150,11 +155,10 @@ var Exchange = /*#__PURE__*/_createClass(function Exchange(options) {
     required: (_this$componentConfig8 = this.componentConfig) === null || _this$componentConfig8 === void 0 ? void 0 : _this$componentConfig8.required,
     validator: function validator(_rule, value) {
       var _CONF_MAP$options$typ, _CONF_MAP$options$typ2;
-      return ((_CONF_MAP$options$typ = CONF_MAP[options.type]) === null || _CONF_MAP$options$typ === void 0 ? void 0 : (_CONF_MAP$options$typ2 = _CONF_MAP$options$typ.validator) === null || _CONF_MAP$options$typ2 === void 0 ? void 0 : _CONF_MAP$options$typ2.call(_CONF_MAP$options$typ, _rule, value, options.type, _this.componentConfig)) || function () {
-        return Promise.resolve();
-      };
+      return ((_CONF_MAP$options$typ = CONF_MAP[options.type]) === null || _CONF_MAP$options$typ === void 0 ? void 0 : (_CONF_MAP$options$typ2 = _CONF_MAP$options$typ.validator) === null || _CONF_MAP$options$typ2 === void 0 ? void 0 : _CONF_MAP$options$typ2.call(_CONF_MAP$options$typ, _rule, value, options.type, _this.componentConfig)) || Promise.resolve();
     }
   }];
-  this.dataType = 'object';
+  this.dataType = "object";
+  this.sortChildField = this.getSortChildFields();
 });
 export default Exchange;

package/dist/esm/components/Public/Goods/index.js

@@ -14,8 +14,8 @@ import { BsGoodsTable } from "../../Common";
 import CommonHeaderGoods from "../../CommonHeaderGood";
 import ItemView from "../../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
-import { CommonGoods as Goods } from "@kmkf-fe-packages/basic-components";
-import { getColumnsMap } from "../../Common/constants/columnsBaseInfoMap";
+import { CommonGoods as Goods, erpFormValidator } from "@kmkf-fe-packages/basic-components";
+import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 import { SYMBOL } from "../../../constant";
 var CONFIG_MAP = {
   JST_GOODS: {
@@ -26,6 +26,10 @@ var CONFIG_MAP = {
     name: "快麦ERP",
     key: "kmGoods"
   },
+  KM_AFTERSALE_GOODS: {
+    name: "快麦ERP售后",
+    key: "kmAftersaleGoods"
+  },
   JY_GOODS: {
     name: "巨益",
     key: "jyGoods",
@@ -41,7 +45,19 @@ var CONFIG_MAP = {
   },
   DXD_SUPPLIERS: {
     name: "大希地供应商",
-    key: "dxdSuppliers"
+    key: "dxdSuppliers",
+    validator: function validator(_rule, value, type, componentConfig) {
+      if (!_rule.required) return Promise.resolve();
+      var validatorResult = erpFormValidator(_rule, value, type, componentConfig);
+      if (validatorResult) {
+        return validatorResult;
+      }
+      return Promise.resolve();
+    }
+  },
+  TTX_GOODS: {
+    name: "通天晓",
+    key: "ttxGoods"
   },
   WDT_AFTERSALE_GOODS: {
     name: "旺店通售后",
@@ -79,17 +95,7 @@ var PublicGoods = /*#__PURE__*/_createClass(function PublicGoods(options) {
   _defineProperty(this, "standardDateType", void 0);
   _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "getSortChildFields", function () {
-    var Columns = getColumnsMap();
-    return Columns[_this.type].filter(function (item) {
-      return !["picUrl"].includes(item.dataIndex);
-    }).map(function (item) {
-      return {
-        name: item.title,
-        key: "".concat(_this.id, "_").concat(item.dataIndex),
-        dataType: "arrayObject",
-        conditionOptionsSetting: item.conditionOptionsSetting
-      };
-    });
+    return getGoodsSortChildFields(_this.type, _this.id);
   });
   _defineProperty(this, "renderClient", function (record) {
     var _record, _CONFIG_MAP$_this$typ, _this$componentConfig;
@@ -169,17 +175,24 @@ var PublicGoods = /*#__PURE__*/_createClass(function PublicGoods(options) {
   }));
   this.children = [this.headers];
   this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
-  this.rules = this !== null && this !== void 0 && (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required ? [{
-    required: true,
+  var isRequired = !!(this !== null && this !== void 0 && (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required);
+  this.rules = [{
+    required: isRequired,
     validator: function validator(_, value) {
       var _value$key;
-      if (!value || !(value !== null && value !== void 0 && (_value$key = value[key]) !== null && _value$key !== void 0 && _value$key.length)) {
+      if (isRequired && (!value || !(value !== null && value !== void 0 && (_value$key = value[key]) !== null && _value$key !== void 0 && _value$key.length))) {
         var _CONFIG_MAP$_this$typ6;
         return Promise.reject(new Error("\u8BF7\u9009\u62E9".concat((_CONFIG_MAP$_this$typ6 = CONFIG_MAP[_this.type]) === null || _CONFIG_MAP$_this$typ6 === void 0 ? void 0 : _CONFIG_MAP$_this$typ6.name, "\u5546\u54C1")));
       }
       return Promise.resolve();
     }
-  }] : [];
+  }, {
+    required: isRequired,
+    validator: function validator(_rule, value) {
+      var _CONFIG_MAP$_this$typ7, _CONFIG_MAP$_this$typ8;
+      return ((_CONFIG_MAP$_this$typ7 = CONFIG_MAP[_this.type]) === null || _CONFIG_MAP$_this$typ7 === void 0 ? void 0 : (_CONFIG_MAP$_this$typ8 = _CONFIG_MAP$_this$typ7.validator) === null || _CONFIG_MAP$_this$typ8 === void 0 ? void 0 : _CONFIG_MAP$_this$typ8.call(_CONFIG_MAP$_this$typ7, _rule, value, _this.type, _this.componentConfig)) || Promise.resolve();
+    }
+  }];
   this.dataType = "object";
   this.sortChildField = this.getSortChildFields();
   this.exampleValue = ((_CONFIG_MAP$this$type2 = CONFIG_MAP[this.type]) === null || _CONFIG_MAP$this$type2 === void 0 ? void 0 : _CONFIG_MAP$this$type2.exampleValue) || "";

package/dist/esm/components/Public/ReissueGoods/index.d.ts

@@ -16,11 +16,18 @@ declare class PublicReissue implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
     bsType: BsType;
     systemOrderNo: SystemOrderNo;
     systemOrderType?: SystemOrderType;
     goods: BsHeaderGood | CommonHeaderGoods;
     constructor(options: PickOption);
+    getSortChildFields: () => {
+        name: any;
+        key: string;
+        dataType: string;
+        conditionOptionsSetting: any;
+    }[];
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;
     renderLog: (r: Record) => React.JSX.Element;

package/dist/esm/components/Public/ReissueGoods/index.js

@@ -18,6 +18,7 @@ import { BsGoodsTable } from "../../Common/index";
 import { BsType, SystemOrderNo } from "../../BS/common/index";
 import SystemOrderType from "../SystemOrderType";
 import CommonHeaderGoods from "../../CommonHeaderGood";
+import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 var typeMap = {
   JST_REISSUE_GOODS: {
     key: "jstReissueGoods",
@@ -174,10 +175,14 @@ var PublicReissue = /*#__PURE__*/_createClass(function PublicReissue(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "bsType", void 0);
   _defineProperty(this, "systemOrderNo", void 0);
   _defineProperty(this, "systemOrderType", void 0);
   _defineProperty(this, "goods", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    return getGoodsSortChildFields(_this.type, _this.id);
+  });
   _defineProperty(this, "renderClient", function (record) {
     var _record, _typeMap$_this$type, _record2, _typeMap$_this$type2, _this$componentConfig;
     return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, _this.bsType.renderClient(record), _this.systemOrderNo.renderClient(record), _this.systemOrderType && _this.systemOrderType.renderClient(record), record !== null && record !== void 0 && (_record = record["".concat(_this.id)]) !== null && _record !== void 0 && _record[(_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.key].length ? /*#__PURE__*/React.createElement(ItemView, {
@@ -325,11 +330,10 @@ var PublicReissue = /*#__PURE__*/_createClass(function PublicReissue(options) {
     required: isRequired,
     validator: function validator(_rule, value) {
       var _typeMap$options$type14, _typeMap$options$type15;
-      return ((_typeMap$options$type14 = typeMap[options.type]) === null || _typeMap$options$type14 === void 0 ? void 0 : (_typeMap$options$type15 = _typeMap$options$type14.validator) === null || _typeMap$options$type15 === void 0 ? void 0 : _typeMap$options$type15.call(_typeMap$options$type14, _rule, value, options.type, _this.componentConfig)) || function () {
-        return Promise.resolve();
-      };
+      return ((_typeMap$options$type14 = typeMap[options.type]) === null || _typeMap$options$type14 === void 0 ? void 0 : (_typeMap$options$type15 = _typeMap$options$type14.validator) === null || _typeMap$options$type15 === void 0 ? void 0 : _typeMap$options$type15.call(_typeMap$options$type14, _rule, value, options.type, _this.componentConfig)) || Promise.resolve();
     }
   }];
   this.dataType = "object";
+  this.sortChildField = this.getSortChildFields();
 });
 export default PublicReissue;

package/dist/esm/components/Public/ReturnWarehouse/index.d.ts

@@ -26,7 +26,7 @@ declare class ReturnWarehouse implements ComponentInterface {
     renderPc: (value: any, record: Record) => React.JSX.Element;
     renderLog: (r: Record) => React.JSX.Element | null;
     getComponentValue: (r: Record) => any;
-    renderExport: (value: any, record: any) => any;
+    renderExport: (value: any, record: any) => string;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => ({
         searchDefaultConditions: "in";

package/dist/esm/components/Public/ReturnWarehouse/index.js

@@ -106,6 +106,9 @@ var ReturnWarehouse = /*#__PURE__*/_createClass(function ReturnWarehouse(_option
   _defineProperty(this, "renderExport", function (value, record) {
     var _typeMap$_this$type6;
     var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type6 = typeMap[_this.type]) === null || _typeMap$_this$type6 === void 0 ? void 0 : _typeMap$_this$type6.key)];
+    if (!Array.isArray(list)) {
+      return '';
+    }
     return (list || []).map(function (item) {
       return [item === null || item === void 0 ? void 0 : item.returnWarehouseId, SendDataCenter.getInstance(_this.type).getSendNameByCode(item === null || item === void 0 ? void 0 : item.returnWarehouseName)].join("/");
     }).join(",");

package/dist/esm/components/Reissue/Logistics/index.d.ts

@@ -27,7 +27,7 @@ declare class Logistics implements ComponentInterface {
     renderPc: (value: any, record: Record) => React.JSX.Element;
     renderLog: (r: Record) => React.JSX.Element | null;
     getComponentValue: (r: Record) => any;
-    renderExport: (value: any, record: any) => any;
+    renderExport: (value: any, record: any) => string;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => ({
         searchDefaultConditions: "in";

package/dist/esm/components/Reissue/Logistics/index.js

@@ -110,6 +110,9 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
   _defineProperty(this, "renderExport", function (value, record) {
     var _typeMap$_this$type4;
     var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type4 = typeMap[_this.type]) === null || _typeMap$_this$type4 === void 0 ? void 0 : _typeMap$_this$type4.key)];
+    if (!Array.isArray(list)) {
+      return '';
+    }
     return (list || []).map(function (item) {
       var _this$componentConfig3, _ref;
       return [["gy", "jy"].includes(((_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.logistics) || "") ? (_ref = _this.expressDateInstance.getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCompany, false) || (item === null || item === void 0 ? void 0 : item.logisticsCompanyName)) !== null && _ref !== void 0 ? _ref : "" : _this.expressDateInstance.getExpressNameByCode(item === null || item === void 0 ? void 0 : item.logisticsCompany), item === null || item === void 0 ? void 0 : item.logisticsCode].join("/");

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

@@ -17,9 +17,12 @@ declare class ERemark implements ComponentInterface {
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
+    effects: ComponentInterface['effects'];
     dataType: ComponentInterface['dataType'];
     constructor(options: PickOption);
-    render: (value: Value) => React.JSX.Element;
+    getShop: (record?: Record) => any;
+    isYouzan: (record?: Record) => boolean;
+    render: (value: Value, isYouzan?: boolean) => React.JSX.Element;
     renderClient: (record: Record) => React.JSX.Element | null;
     renderPc: (value: unknown, record: Record) => React.JSX.Element;
     renderLog: (r: Record) => React.JSX.Element | null;

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

@@ -1,4 +1,11 @@
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+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 _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); }
+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; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -6,7 +13,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 React from 'react';
-import { Remark } from '@kmkf-fe-packages/basic-components';
+import { Remark, YouzanStar } from '@kmkf-fe-packages/basic-components';
 import GetFormItem from "../GetFormItem";
 import trade0 from "./flag/trade-icon-flag-0.png";
 import trade1 from "./flag/trade-icon-flag-1.png";
@@ -16,7 +23,7 @@ import trade4 from "./flag/trade-icon-flag-4.png";
 import trade5 from "./flag/trade-icon-flag-5.png";
 import get from 'lodash/get';
 import ItemView from "../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn, isYouzanShop, normalizeYouzanStar } from '@kmkf-fe-packages/kmkf-utils';
 import { SYMBOL, batchInput, SEARCH_OPTIONS } from "../../constant";
 var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
   var _this = this,
@@ -34,14 +41,30 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
   _defineProperty(this, "formField", void 0);
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
+  _defineProperty(this, "effects", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "getShop", function (record) {
+    var _this$effects, _this$effects2, _this$effects2$form, _this$effects3, _this$effects3$shopLi;
+    var shopId = (record === null || record === void 0 ? void 0 : record.shopId) || ((_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId) || ((_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : (_this$effects2$form = _this$effects2.form) === null || _this$effects2$form === void 0 ? void 0 : _this$effects2$form.getFieldValue('shopId'));
+    return (_this$effects3 = _this.effects) === null || _this$effects3 === void 0 ? void 0 : (_this$effects3$shopLi = _this$effects3.shopList) === null || _this$effects3$shopLi === void 0 ? void 0 : _this$effects3$shopLi.find(function (shop) {
+      return shop.shopId === shopId;
+    });
+  });
+  _defineProperty(this, "isYouzan", function (record) {
+    return isYouzanShop(_this.getShop(record));
+  });
   _defineProperty(this, "render", function (value) {
+    var isYouzan = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var index = get(value, 'flag');
     return /*#__PURE__*/React.createElement("div", {
       style: {
         display: 'inline-block'
       }
-    }, index !== undefined && /*#__PURE__*/React.createElement("img", {
+    }, isYouzan ? normalizeYouzanStar(index) ? /*#__PURE__*/React.createElement(YouzanStar, {
+      compact: true,
+      disabled: true,
+      value: index
+    }) : null : index !== undefined && /*#__PURE__*/React.createElement("img", {
       src: _this.imgList[Number(index)]
     }), /*#__PURE__*/React.createElement("span", null, get(value, 'remark')));
   });
@@ -49,7 +72,7 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id])
+      value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id], _this.isYouzan(record))
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
@@ -57,11 +80,16 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
       return /*#__PURE__*/React.createElement("span", null, "--");
     }
     var index = get(record, "".concat(_this.id, "_flag"));
+    var isYouzan = _this.isYouzan(record);
     return /*#__PURE__*/React.createElement("div", {
       style: {
         display: 'inline-block'
       }
-    }, !isNull(get(record, "".concat(_this.id, "_flag"))) ? index !== undefined && /*#__PURE__*/React.createElement("img", {
+    }, !isNull(get(record, "".concat(_this.id, "_flag"))) ? isYouzan ? normalizeYouzanStar(index) && /*#__PURE__*/React.createElement(YouzanStar, {
+      compact: true,
+      disabled: true,
+      value: index
+    }) : index !== undefined && /*#__PURE__*/React.createElement("img", {
       src: _this.imgList[Number(index)]
     }) :
     // <i
@@ -94,7 +122,9 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
       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 : '',
-      component: /*#__PURE__*/React.createElement(Remark, _this.componentConfig)
+      component: /*#__PURE__*/React.createElement(Remark, _extends({}, _this.componentConfig, {
+        isYouzan: _this.isYouzan()
+      }))
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
@@ -111,7 +141,10 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
       // 过滤组件名称
       filterComponentType: 'SelectInput',
       props: {
-        filterOptions: SEARCH_OPTIONS
+        filterOptions: [].concat(_toConsumableArray(SEARCH_OPTIONS), [{
+          label: "关键词不包含",
+          value: "nincludeLike"
+        }])
       },
       filterFn: function filterFn(value) {
         return function (i) {
@@ -170,6 +203,7 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
   this.formField = "".concat(options.id, "_remark");
   this.type = options.type;
   this.componentConfig = options.componentConfig;
+  this.effects = options.effects;
   this.dataType = 'object';
   this.rules = (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
     validator: function validator(_, value) {
@@ -177,8 +211,11 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
       if (!(value !== null && value !== void 0 && value.remark)) {
         return Promise.reject(new Error('请输入备注'));
       }
-      if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.isShowFlag && !(value !== null && value !== void 0 && value.flag) && (value === null || value === void 0 ? void 0 : value.flag) !== 0) {
-        return Promise.reject(new Error('请选择旗帜'));
+      if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.isShowFlag) {
+        var flag = _this.isYouzan() ? normalizeYouzanStar(value === null || value === void 0 ? void 0 : value.flag) : value === null || value === void 0 ? void 0 : value.flag;
+        if (!flag && flag !== 0) {
+          return Promise.reject(new Error(_this.isYouzan() ? '请选择星标' : '请选择旗帜'));
+        }
       }
       return Promise.resolve();
     }

package/dist/esm/components/SKX/SkxGoods/index.d.ts

@@ -14,8 +14,15 @@ declare class SkxGoods implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
+    sortChildField: NonNullable<ComponentInterface["sortChildField"]>;
     skxGoods: CommonHeaderGoods;
     constructor(options: PickOption);
+    getSortChildFields: () => {
+        name: any;
+        key: string;
+        dataType: string;
+        conditionOptionsSetting: any;
+    }[];
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: () => null;
     renderLog: (r: Record) => React.JSX.Element | null;

package/dist/esm/components/SKX/SkxGoods/index.js

@@ -16,6 +16,7 @@ import ItemView from "../../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { SkxGoods as Goods } from "@kmkf-fe-packages/basic-components";
 import { SYMBOL } from "../../../constant";
+import { getGoodsSortChildFields } from "../../Common/constants/columnsBaseInfoMap";
 var typeMap = {
   SKX_GOODS: {
     name: "[SKX]商品信息(ON)",
@@ -42,7 +43,11 @@ var SkxGoods = /*#__PURE__*/_createClass(function SkxGoods(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "skxGoods", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    return getGoodsSortChildFields(_this.type, _this.id);
+  });
   _defineProperty(this, "renderClient", function (record) {
     var _record, _this$componentConfig;
     return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) ? /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ItemView, {
@@ -131,5 +136,6 @@ var SkxGoods = /*#__PURE__*/_createClass(function SkxGoods(options) {
     }
   }] : [];
   this.dataType = "object";
+  this.sortChildField = this.getSortChildFields();
 });
 export default SkxGoods;

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

@@ -37,6 +37,12 @@ var typeMap = {
   },
   JST_OUTBOUND_STATUS: {
     key: "jstOutboundStatus"
+  },
+  PLATFORM_TRANSIT_FLAG: {
+    key: "platformTransitFlag"
+  },
+  PLATFORM_TRANSIT_TYPE: {
+    key: "platformTransitType"
   }
 };
 var BasicSelect = /*#__PURE__*/_createClass(function BasicSelect(options) {

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

@@ -11,6 +11,7 @@ declare class StatusSelect implements ComponentInterface {
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
+    sortChildField?: ComponentInterface["sortChildField"];
     dataType: ComponentInterface["dataType"];
     options: ComponentInterface["options"];
     constructor(options: PickOption);
@@ -34,6 +35,31 @@ declare class StatusSelect implements ComponentInterface {
             }[];
         };
         filterFn: (value: string) => (i: Record) => boolean;
-    };
+    } | ({
+        searchDefaultConditions: "in";
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        props: {
+            options: {
+                value: string;
+                label: string;
+                color: string;
+            }[];
+        };
+        filterFn: (value: string) => (i: Record) => boolean;
+    } | {
+        searchDefaultConditions: "anylike";
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        props: {
+            placeholder: string;
+        };
+        filterFn: (value: string) => (i: Record) => boolean;
+        formatFilterValue: (val: string) => string | string[];
+    })[];
 }
 export default StatusSelect;