@kmkf-fe-packages/services-components 2.9.0-rc.0 → 2.9.0

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

@@ -0,0 +1,210 @@
+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 _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"); } }
+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 some from "lodash/some";
+import GetFormItem from "../../GetFormItem";
+import { JstGoodImage } from "../../Common";
+import { JstGoods } from "@kmkf-fe-packages/basic-components";
+import ItemView from "../../../commonComponents/ItemView";
+import { isNull, filterFn as _filterFn, SendDataCenter } from "@kmkf-fe-packages/kmkf-utils";
+import { SYMBOL } from "../../../constant";
+var typeMap = {
+  KM_RETURN_WAREHOUSE: {
+    key: "kmReturnWarehouse",
+    name: "km",
+    returnWarehouseId: "kmReturnWarehouseId",
+    returnWarehouseName: "kmReturnWarehouseName",
+    platformType: "km",
+    dataType: "weakenArray",
+    placeholder: "请选择快麦退货仓"
+  }
+};
+var ReturnWarehouse = /*#__PURE__*/_createClass(function ReturnWarehouse(_options) {
+  var _this = this,
+    _typeMap$_options$typ,
+    _typeMap$_options$typ2,
+    _this$componentConfig3,
+    _typeMap$_options$typ3,
+    _this$componentConfig4;
+  _classCallCheck(this, ReturnWarehouse);
+  _defineProperty(this, "name", void 0);
+  _defineProperty(this, "id", void 0);
+  _defineProperty(this, "sortField", void 0);
+  _defineProperty(this, "sortChildField", void 0);
+  _defineProperty(this, "type", void 0);
+  _defineProperty(this, "rules", void 0);
+  _defineProperty(this, "componentConfig", void 0);
+  _defineProperty(this, "align", void 0);
+  _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "formField", void 0);
+  _defineProperty(this, "canSort", void 0);
+  _defineProperty(this, "children", void 0);
+  _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "format", void 0);
+  _defineProperty(this, "getSortChildFields", function (type, options, fieldType) {
+    var _typeMap$options$type, _typeMap$options$type2, _typeMap$options$type3;
+    var returnWarehouseName = {
+      name: "退货仓名称",
+      key: "".concat(options.id, "_").concat((_typeMap$options$type = typeMap[options.type]) === null || _typeMap$options$type === void 0 ? void 0 : _typeMap$options$type.returnWarehouseName),
+      dataType: (_typeMap$options$type2 = typeMap[options.type]) === null || _typeMap$options$type2 === void 0 ? void 0 : _typeMap$options$type2.dataType,
+      disabled: type === "returnWarehouseId"
+    };
+    var returnWarehouseId = {
+      name: "退货仓编码",
+      key: "".concat(options.id, "_").concat((_typeMap$options$type3 = typeMap[options.type]) === null || _typeMap$options$type3 === void 0 ? void 0 : _typeMap$options$type3.returnWarehouseId),
+      dataType: "arrayObject",
+      disabled: type === "returnWarehouseName"
+    };
+    returnWarehouseName.options = fieldType && SendDataCenter.getInstance(fieldType).getSendData();
+    return [returnWarehouseName, returnWarehouseId];
+  });
+  _defineProperty(this, "renderClient", function (record) {
+    var _typeMap$_this$type;
+    var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {
+      return !isNull(item);
+    }) : false;
+    return isShow ? /*#__PURE__*/React.createElement(ItemView, {
+      id: _this.id,
+      label: _this.name,
+      value: /*#__PURE__*/React.createElement(JstGoodImage, {
+        list: record === null || record === void 0 ? void 0 : record[_this.id],
+        type: 5,
+        platformType: (_typeMap$_this$type = typeMap[_this.type]) === null || _typeMap$_this$type === void 0 ? void 0 : _typeMap$_this$type.platformType
+      })
+    }) : null;
+  });
+  _defineProperty(this, "renderPc", function (value, record) {
+    var _typeMap$_this$type2, _typeMap$_this$type3;
+    var list = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat((_typeMap$_this$type2 = typeMap[_this.type]) === null || _typeMap$_this$type2 === void 0 ? void 0 : _typeMap$_this$type2.key)];
+    //兼容多个商品
+    return /*#__PURE__*/React.createElement("span", {
+      onClick: function onClick(e) {
+        return e.stopPropagation();
+      }
+    }, /*#__PURE__*/React.createElement(JstGoodImage, {
+      list: list,
+      type: 5,
+      platformType: (_typeMap$_this$type3 = typeMap[_this.type]) === null || _typeMap$_this$type3 === void 0 ? void 0 : _typeMap$_this$type3.platformType
+    }));
+  });
+  _defineProperty(this, "renderLog", function (r) {
+    var _typeMap$_this$type4;
+    var list = r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat((_typeMap$_this$type4 = typeMap[_this.type]) === null || _typeMap$_this$type4 === void 0 ? void 0 : _typeMap$_this$type4.key)];
+    if (isNull(list)) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    var _typeMap$_this$type5;
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat((_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.key)];
+  });
+  _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)];
+    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(",");
+  });
+  _defineProperty(this, "editRender", function (p) {
+    var _this$componentConfig, _this$componentConfig2, _typeMap$_this$type7;
+    return /*#__PURE__*/React.createElement(GetFormItem, {
+      title: _this.name,
+      name: _this.id,
+      rules: _this.rules,
+      required: false,
+      hidden: p === null || p === void 0 ? void 0 : p.hidden,
+      display: p === null || p === void 0 ? void 0 : p.display,
+      tooltip: (_this$componentConfig = _this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.showTooltip ? (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.tooltip : "",
+      component: /*#__PURE__*/React.createElement(JstGoods, _extends({}, _this.componentConfig, {
+        type: 5,
+        platformType: (_typeMap$_this$type7 = typeMap[_this.type]) === null || _typeMap$_this$type7 === void 0 ? void 0 : _typeMap$_this$type7.platformType,
+        onlyShowFieldSelect: _this.componentConfig ? _this.componentConfig.showField === "returnWarehouseName" : false
+      }))
+    });
+  });
+  _defineProperty(this, "filterConfig", function (item) {
+    var _typeMap$_this$type8, _typeMap$_this$type9;
+    return [{
+      searchDefaultConditions: SYMBOL.in,
+      type: item.type,
+      id: "".concat(item.id, "_").concat((_typeMap$_this$type8 = typeMap[_this.type]) === null || _typeMap$_this$type8 === void 0 ? void 0 : _typeMap$_this$type8.returnWarehouseName),
+      name: "".concat(_this.name, "-\u540D\u79F0"),
+      filterComponentType: "MultipleSelect",
+      props: {
+        options: SendDataCenter.getInstance(item.type).getSendData().map(function (item) {
+          return {
+            label: item.label,
+            value: item.label
+          };
+        })
+      },
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var _ref;
+          return (_ref = _filterFn.filterTableListItemColumnValue(i, item.id, "returnWarehouseName").split(",") || []) === null || _ref === void 0 ? void 0 : _ref.some(function (item) {
+            var _String;
+            var returnWarehouseName = item ? (_String = String(item)) === null || _String === void 0 ? void 0 : _String.includes(value) : false;
+            return returnWarehouseName;
+          });
+        };
+      }
+    }, {
+      searchDefaultConditions: SYMBOL.like,
+      type: item.type,
+      id: "".concat(item.id, "_").concat((_typeMap$_this$type9 = typeMap[_this.type]) === null || _typeMap$_this$type9 === void 0 ? void 0 : _typeMap$_this$type9.returnWarehouseId),
+      name: "".concat(_this.name, "-\u7F16\u7801"),
+      filterComponentType: "Input",
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var _ref2, _typeMap$_this$type10;
+          return (_ref2 = _filterFn.filterTableListItemColumnValue(i, item.id, (_typeMap$_this$type10 = typeMap[_this.type]) === null || _typeMap$_this$type10 === void 0 ? void 0 : _typeMap$_this$type10.key) || []) === null || _ref2 === void 0 ? void 0 : _ref2.some(function (item) {
+            var _String2;
+            var id = item !== null && item !== void 0 && item.returnWarehouseId ? (_String2 = String(item === null || item === void 0 ? void 0 : item.returnWarehouseId)) === null || _String2 === void 0 ? void 0 : _String2.includes(value) : false;
+            return id;
+          });
+        };
+      }
+    }];
+  });
+  this.name = _options.name;
+  this.id = _options.id;
+  this.sortField = "".concat(_options.id, "_").concat((_typeMap$_options$typ = typeMap[_options.type]) === null || _typeMap$_options$typ === void 0 ? void 0 : _typeMap$_options$typ.key);
+  this.formField = "".concat(_options.id, "_").concat((_typeMap$_options$typ2 = typeMap[_options.type]) === null || _typeMap$_options$typ2 === void 0 ? void 0 : _typeMap$_options$typ2.key);
+  this.componentConfig = _options.componentConfig;
+  this.sortChildField = this.getSortChildFields(((_this$componentConfig3 = this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.showField) || "", _options, _options.type);
+  this.type = _options.type;
+  this.dataType = (_typeMap$_options$typ3 = typeMap[_options.type]) === null || _typeMap$_options$typ3 === void 0 ? void 0 : _typeMap$_options$typ3.dataType;
+  this.rules = (_this$componentConfig4 = this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.required ? [{
+    required: true,
+    validator: function validator(_, value) {
+      if (!value || !value.length) {
+        var _typeMap$_options$typ4;
+        return Promise.reject(new Error((_typeMap$_options$typ4 = typeMap[_options.type]) === null || _typeMap$_options$typ4 === void 0 ? void 0 : _typeMap$_options$typ4.placeholder));
+      }
+      var hasNo = (value || []).some(function (item) {
+        var _this$componentConfig5, _this$componentConfig6;
+        if (["returnWarehouseName"].includes((_this === null || _this === void 0 ? void 0 : (_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.showField) || "")) {
+          return item.returnWarehouseName;
+        } else if (["returnWarehouseId"].includes((_this === null || _this === void 0 ? void 0 : (_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.showField) || "")) {
+          return item.returnWarehouseId;
+        } else {
+          return item.returnWarehouseId && item.returnWarehouseName;
+        }
+      });
+      if (!hasNo) {
+        return Promise.reject(new Error("\u81F3\u5C11\u586B\u5199\u4E00\u4E2A\u5B8C\u6574\u7684\u9000\u8D27\u4ED3\u4FE1\u606F"));
+      }
+      return Promise.resolve();
+    }
+  }] : [];
+  this.align = "left";
+  this.isCombinationComponent = false;
+  this.canSort = false;
+  this.children = [];
+});
+export default ReturnWarehouse;

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

@@ -1,6 +1,6 @@
-import { ComponentInterface, PickOption, Record } from "../../type";
-import React from "react";
-import { AddressData } from "@kmkf-fe-packages/kmkf-utils";
+import { ComponentInterface, PickOption, Record } from '../../type';
+import React from 'react';
+import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
 declare type Value = {
     address?: (string | number)[];
     detail?: string;
@@ -11,14 +11,15 @@ declare class BasicInput 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[];
     addressDateInstance: InstanceType<typeof AddressData>;
-    dataType: ComponentInterface["dataType"];
+    dataType: ComponentInterface['dataType'];
+    compoundConfig: ComponentInterface['compoundConfig'];
     constructor(options: PickOption);
     render: (value: Value) => React.JSX.Element;
     transTextToNumber: (value?: string) => string | number | undefined;

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

@@ -8,17 +8,17 @@ 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 { Address } from "@kmkf-fe-packages/basic-components";
-import { AddressData } from "@kmkf-fe-packages/kmkf-utils";
+import React from 'react';
+import { Address } from '@kmkf-fe-packages/basic-components';
+import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull } from "@kmkf-fe-packages/kmkf-utils";
-import every from "lodash/every";
+import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import every from 'lodash/every';
 import { queryWorkOrderDetail } from "../../service/api";
-import copy from "copy-to-clipboard";
-import { message } from "antd";
-import { CopyOutlined } from "@ant-design/icons";
+import copy from 'copy-to-clipboard';
+import { message } from 'antd';
+import { CopyOutlined } from '@ant-design/icons';
 var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
   var _this = this,
     _this$componentConfig5;
@@ -36,13 +36,14 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "addressDateInstance", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "compoundConfig", void 0);
   _defineProperty(this, "render", function (value) {
     var _value$address;
     return /*#__PURE__*/React.createElement("span", {
       className: "pointer"
     }, value === null || value === void 0 ? void 0 : (_value$address = value.address) === null || _value$address === void 0 ? void 0 : _value$address.map(function (suffix) {
       return _this.addressDateInstance.getNameByCode(suffix);
-    }).join(""), value === null || value === void 0 ? void 0 : value.detail);
+    }).join(''), value === null || value === void 0 ? void 0 : value.detail);
   });
   _defineProperty(this, "transTextToNumber", function (value) {
     return value ? +value : value;
@@ -66,10 +67,10 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
               e.stopPropagation();
               _context.prev = 1;
               addressText = (_address = address) === null || _address === void 0 ? void 0 : _address.map(function () {
-                var suffix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
+                var suffix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
                 return _this.addressDateInstance.getNameByCode(suffix);
-              }).join("");
-              if (!(detail.indexOf("*") > -1)) {
+              }).join('');
+              if (!(detail.indexOf('*') > -1)) {
                 _context.next = 12;
                 break;
               }
@@ -85,21 +86,20 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
               success = _yield$queryWorkOrder.success;
               if (success) {
                 copy("".concat(addressText).concat(data === null || data === void 0 ? void 0 : (_data$jsonMap = data.jsonMap) === null || _data$jsonMap === void 0 ? void 0 : _data$jsonMap["".concat(_this.id, "_address")]));
-                message.success("复制成功");
+                message.success('复制成功');
               }
               _context.next = 14;
               break;
             case 12:
               copy("".concat(addressText).concat(detail));
-              message.success("复制成功");
+              message.success('复制成功');
             case 14:
-              _context.next = 19;
+              _context.next = 18;
               break;
             case 16:
               _context.prev = 16;
               _context.t0 = _context["catch"](1);
-              console.log(_context.t0);
-            case 19:
+            case 18:
             case "end":
               return _context.stop();
           }
@@ -113,15 +113,15 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
       className: "pointer",
       onClick: function onClick(e) {
         var _this$effects, _this$effects2;
-        typeof (_this === null || _this === void 0 ? void 0 : (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.queryWorkOrderDetail) === "function" && (_this === null || _this === void 0 ? void 0 : (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.queryWorkOrderDetail(record));
+        typeof (_this === null || _this === void 0 ? void 0 : (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.queryWorkOrderDetail) === 'function' && (_this === null || _this === void 0 ? void 0 : (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.queryWorkOrderDetail(record));
         e.stopPropagation();
       }
     }, (_address2 = address) === null || _address2 === void 0 ? void 0 : _address2.map(function () {
-      var suffix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
+      var suffix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
       return _this.addressDateInstance.getNameByCode(suffix);
-    }).join(""), detail, " ", /*#__PURE__*/React.createElement(CopyOutlined, {
+    }).join(''), detail, ' ', /*#__PURE__*/React.createElement(CopyOutlined, {
       style: {
-        color: "#1B5BF3"
+        color: '#1B5BF3'
       },
       onClick: function onClick(e) {
         return copyHandler(e, record);
@@ -136,9 +136,9 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
     }) ? [] : address;
     var detail = r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_address")];
     return "".concat((_address3 = address) === null || _address3 === void 0 ? void 0 : _address3.map(function () {
-      var suffix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
+      var suffix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
       return _this.addressDateInstance.getNameByCode(suffix);
-    }).join(""), " ").concat(detail || "");
+    }).join(''), " ").concat(detail || '');
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return {
@@ -149,7 +149,7 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
   _defineProperty(this, "renderExport", function (value, record) {
     var _address4;
     if (record["".concat(_this.id, "_province")] === undefined) {
-      return "--";
+      return '--';
     }
     var address = [_this.transTextToNumber(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_province")]), _this.transTextToNumber(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_city")]), _this.transTextToNumber(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_district")])];
     address = every(address, function (item) {
@@ -157,9 +157,9 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
     }) ? [] : address;
     var detail = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_address")];
     return "".concat((_address4 = address) === null || _address4 === void 0 ? void 0 : _address4.map(function () {
-      var suffix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
+      var suffix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
       return _this.addressDateInstance.getNameByCode(suffix);
-    }).join(""), " ").concat(detail || "");
+    }).join(''), " ").concat(detail || '');
   });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
@@ -177,7 +177,7 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(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(Address, _this.componentConfig)
     });
   });
@@ -197,16 +197,29 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
     validator: function validator(_, value) {
       var _value$address2;
       if (!(value !== null && value !== void 0 && (_value$address2 = value.address) !== null && _value$address2 !== void 0 && _value$address2.length)) {
-        return Promise.reject(new Error("请选择地址"));
+        return Promise.reject(new Error('请选择地址'));
       }
       if (!(value !== null && value !== void 0 && value.detail)) {
-        return Promise.reject(new Error("请填写详细地址"));
+        return Promise.reject(new Error('请填写详细地址'));
       }
       return Promise.resolve();
     }
   }] : [];
   this.effects = options.effects;
   this.addressDateInstance = AddressData.getInstance();
-  this.dataType = "object";
+  this.dataType = 'object';
+  this.compoundConfig = [{
+    name: "\u7701",
+    id: "".concat(options.id, "_province")
+  }, {
+    name: "\u5E02",
+    id: "".concat(options.id, "_city")
+  }, {
+    name: "\u533A",
+    id: "".concat(options.id, "_district")
+  }, {
+    name: "\u8BE6\u7EC6\u5730\u5740",
+    id: "".concat(options.id, "_address")
+  }];
 });
 export default BasicInput;

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

@@ -112,7 +112,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
     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)];
     return (list || []).map(function (item) {
       var _this$componentConfig3, _ref;
-      return [((_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.logistics) === "gy" ? (_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("/");
+      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("/");
     }).join(",");
   });
   _defineProperty(this, "editRender", function (p) {
@@ -195,7 +195,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(_options) {
     validator: function validator(_, value) {
       var hasNo = (value || []).some(function (item) {
         var _this$componentConfig10;
-        if (((_this$componentConfig10 = _this.componentConfig) === null || _this$componentConfig10 === void 0 ? void 0 : _this$componentConfig10.logistics) === "gy") {
+        if (["gy", "jy"].includes(((_this$componentConfig10 = _this.componentConfig) === null || _this$componentConfig10 === void 0 ? void 0 : _this$componentConfig10.logistics) || "")) {
           return (item.logisticsCompany || item.logisticsCompanyName) && item.logisticsCode;
         }
         return item.logisticsCompany && item.logisticsCode;

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

@@ -29,7 +29,7 @@ declare class ERemark implements ComponentInterface {
     };
     renderExport: (value: unknown, record: Record) => any;
     editRender: (p: any) => React.JSX.Element;
-    filterConfig: (item: ColumnConfig) => {
+    filterConfig: (item: ColumnConfig) => ({
         searchDefaultConditions: {
             in: "in";
             anylike: "anylike";
@@ -43,9 +43,25 @@ declare class ERemark implements ComponentInterface {
                 label: string;
                 value: string;
             }[];
+            options?: undefined;
         };
         filterFn: (value: string) => (i: Record) => boolean;
         formatFilterValue: (value: any) => any;
-    };
+    } | {
+        searchDefaultConditions: "in";
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        props: {
+            options: {
+                label: string;
+                value: string;
+            }[];
+            filterOptions?: undefined;
+        };
+        filterFn: (value: string[]) => (i: Record) => boolean;
+        formatFilterValue?: undefined;
+    })[];
 }
 export default ERemark;

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

@@ -98,7 +98,7 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
-    return {
+    return [{
       searchDefaultConditions: {
         in: SYMBOL.in,
         anylike: SYMBOL.anylike
@@ -124,7 +124,42 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
           return value;
         }
       }
-    };
+    }, {
+      searchDefaultConditions: SYMBOL.in,
+      type: item.type,
+      id: "".concat(item.id, "_flag"),
+      // 过滤组件id
+      name: "".concat(item.name, "\u65D7\u5E1C"),
+      // 过滤组件名称
+      filterComponentType: 'MultipleSelect',
+      props: {
+        //不使用workOrderMark的数据，筛选会深拷贝
+        options: [{
+          label: '灰色',
+          value: '0'
+        }, {
+          label: '红色',
+          value: '1'
+        }, {
+          label: '黄色',
+          value: '2'
+        }, {
+          label: '绿色',
+          value: '3'
+        }, {
+          label: '蓝色',
+          value: '4'
+        }, {
+          label: '紫色',
+          value: '5'
+        }]
+      },
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id, ''));
+        };
+      }
+    }];
   });
   this.name = options.name;
   this.id = options.id;

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

@@ -1,8 +1,8 @@
-import { ComponentInterface, PickOption, Record, ColumnConfig } from '../../type';
-import React from 'react';
-import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
-import Express from '../Express';
-import ExpressCode from '../ExpressCode';
+import { ComponentInterface, PickOption, Record, ColumnConfig } from "../../type";
+import React from "react";
+import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
+import Express from "../Express";
+import ExpressCode from "../ExpressCode";
 declare class ReturnLogistics implements ComponentInterface {
     name: string;
     id: string;
@@ -18,7 +18,8 @@ declare class ReturnLogistics implements ComponentInterface {
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface['dataType'];
+    dataType: ComponentInterface["dataType"];
+    isChange: boolean;
     constructor(options: PickOption);
     renderClient: (record: any) => React.JSX.Element;
     renderPc: () => null;