@kmkf-fe-packages/services-components 2.0.19-beta.6 → 2.0.19-beta.61

package/dist/esm/commonComponents/GlobalContext/hook/useGetHasErpData.js

@@ -18,9 +18,14 @@ var getTemplate = function getTemplate(companyUserConfig) {
 };
 function useGetHasErpData(reduxData) {
   var companyUserConfig = useMemo(function () {
-    var _ref, _reduxData$main$userI, _reduxData$main, _reduxData$workOrder, _userInfo$companyUser;
+    var _ref, _ref2, _reduxData$main$userI, _reduxData$main, _reduxData$workOrder, _reduxData$global, _userInfo$companyUser;
     // console.log("companyUserConfig--reduxData", reduxData);
-    var userInfo = (_ref = (_reduxData$main$userI = reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$main = reduxData.main) === null || _reduxData$main === void 0 ? void 0 : _reduxData$main.userInfo) !== null && _reduxData$main$userI !== void 0 ? _reduxData$main$userI : reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$workOrder = reduxData.workOrder) === null || _reduxData$workOrder === void 0 ? void 0 : _reduxData$workOrder.userInfo) !== null && _ref !== void 0 ? _ref : {};
+    /**
+     * main - pc
+     * workOrder - 除千牛工作台外所有插件端
+     * global - 千牛工作台
+     * **/
+    var userInfo = (_ref = (_ref2 = (_reduxData$main$userI = reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$main = reduxData.main) === null || _reduxData$main === void 0 ? void 0 : _reduxData$main.userInfo) !== null && _reduxData$main$userI !== void 0 ? _reduxData$main$userI : reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$workOrder = reduxData.workOrder) === null || _reduxData$workOrder === void 0 ? void 0 : _reduxData$workOrder.userInfo) !== null && _ref2 !== void 0 ? _ref2 : reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$global = reduxData.global) === null || _reduxData$global === void 0 ? void 0 : _reduxData$global.userInfo) !== null && _ref !== void 0 ? _ref : {};
     var companyUserConfig = (_userInfo$companyUser = userInfo === null || userInfo === void 0 ? void 0 : userInfo.companyUserConfig) !== null && _userInfo$companyUser !== void 0 ? _userInfo$companyUser : {};
     if (typeof companyUserConfig === "string") {
       try {

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

@@ -42,9 +42,10 @@ var Global = function Global(_ref) {
     setLoading = _useState4[1];
   var reduxDataMap = useMemo(function () {
     try {
-      sessionStorage.setItem("reduxData_test", JSON.stringify(reduxData || {}));
+      var _ref2, _ref3, _reduxData$main$userI, _reduxData$main, _reduxData$main$userI2, _reduxData$workOrder, _reduxData$workOrder$, _reduxData$global, _reduxData$global$use;
+      sessionStorage.setItem("companyKey_test", (_ref2 = (_ref3 = (_reduxData$main$userI = reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$main = reduxData.main) === null || _reduxData$main === void 0 ? void 0 : (_reduxData$main$userI2 = _reduxData$main.userInfo) === null || _reduxData$main$userI2 === void 0 ? void 0 : _reduxData$main$userI2.companyKey) !== null && _reduxData$main$userI !== void 0 ? _reduxData$main$userI : reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$workOrder = reduxData.workOrder) === null || _reduxData$workOrder === void 0 ? void 0 : (_reduxData$workOrder$ = _reduxData$workOrder.userInfo) === null || _reduxData$workOrder$ === void 0 ? void 0 : _reduxData$workOrder$.companyKey) !== null && _ref3 !== void 0 ? _ref3 : reduxData === null || reduxData === void 0 ? void 0 : (_reduxData$global = reduxData.global) === null || _reduxData$global === void 0 ? void 0 : (_reduxData$global$use = _reduxData$global.userInfo) === null || _reduxData$global$use === void 0 ? void 0 : _reduxData$global$use.companyKey) !== null && _ref2 !== void 0 ? _ref2 : "");
     } catch (error) {
-      console.log("reduxData_test-error", error);
+      console.log("companyKey_test_error", error);
     }
     return reduxData;
   }, [JSON.stringify(reduxData)]);
@@ -77,7 +78,7 @@ var Global = function Global(_ref) {
     return "success";
   }, [globalState, logisticsCompanyState, sendDataState, addressDataState]);
   var reloadData = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -123,11 +124,11 @@ var Global = function Global(_ref) {
       }, _callee);
     }));
     return function reloadData() {
-      return _ref2.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
   var initDataSource = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref5 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var mapping, mergeMapping, promises, _Object$keys, _Object$keys2, _Object$keys2$filter, _promises;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -175,7 +176,7 @@ var Global = function Global(_ref) {
       }, _callee2, null, [[4, 10]]);
     }));
     return function initDataSource() {
-      return _ref3.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   if (allState === "loading") {

package/dist/esm/components/BS/BsPosting/components/Detail/index.d.ts

@@ -1,13 +1,13 @@
 import React from 'react';
-import { ComponentInterface, PickOption, ALignType, Record } from '../../../../../type';
+import { ComponentInterface, PickOption, ALignType, Record, ColumnConfig } from '../../../../../type';
 declare class Detail implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface["componentConfig"];
-    effects: ComponentInterface["effects"];
+    componentConfig: ComponentInterface['componentConfig'];
+    effects: ComponentInterface['effects'];
     align: ALignType;
     width: number;
     isCombinationComponent: boolean;
@@ -15,6 +15,7 @@ declare class Detail implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface['dataType'];
+    parentName?: string;
     constructor(options: PickOption);
     renderClient: (record: Record) => React.JSX.Element | null;
     renderPc: (value: unknown, record: Record) => any;
@@ -22,6 +23,12 @@ declare class Detail implements ComponentInterface {
     renderExport: (value?: string) => string;
     getComponentValue: (r: Record) => any;
     editRender: () => null;
-    filterConfig: () => never[];
+    filterConfig: (item: ColumnConfig) => {
+        searchDefaultConditions: "like";
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+    } | null;
 }
 export default Detail;

package/dist/esm/components/BS/BsPosting/components/Detail/index.js

@@ -8,6 +8,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React from 'react';
 import { isNull } from '@kmkf-fe-packages/kmkf-utils';
 import ItemView from "../../../../../commonComponents/ItemView";
+import { SYMBOL } from "../../../../../constant";
 var Detail = /*#__PURE__*/_createClass(function Detail(options) {
   var _this = this;
   _classCallCheck(this, Detail);
@@ -25,6 +26,7 @@ var Detail = /*#__PURE__*/_createClass(function Detail(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "parentName", void 0);
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
@@ -48,8 +50,14 @@ var Detail = /*#__PURE__*/_createClass(function Detail(options) {
   _defineProperty(this, "editRender", function () {
     return null;
   });
-  _defineProperty(this, "filterConfig", function () {
-    return [];
+  _defineProperty(this, "filterConfig", function (item) {
+    return _this.parentName ? {
+      searchDefaultConditions: SYMBOL.like,
+      type: item.type,
+      id: "".concat(_this.id),
+      name: "".concat(_this.parentName, "-").concat(_this.name),
+      filterComponentType: 'Input'
+    } : null;
   });
   this.name = options.name;
   this.id = options.id;
@@ -65,6 +73,8 @@ var Detail = /*#__PURE__*/_createClass(function Detail(options) {
   this.effects = options === null || options === void 0 ? void 0 : options.effects;
   this.rules = [];
   this.width = 200; // TODO: 针对子组件，必须拥有width属性,否则就会出现多列展示问题
+  if (options.parentName) {
+    this.parentName = options.parentName;
+  }
 });
-
 export default Detail;

package/dist/esm/components/BS/BsPosting/components/District/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { AddressData } from "@kmkf-fe-packages/kmkf-utils";
+import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
 import { ComponentInterface, PickOption, ALignType, Record } from '../../../../../type';
 declare class District implements ComponentInterface {
     name: string;
@@ -7,8 +7,8 @@ declare class District implements ComponentInterface {
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface["componentConfig"];
-    effects: ComponentInterface["effects"];
+    componentConfig: ComponentInterface['componentConfig'];
+    effects: ComponentInterface['effects'];
     align: ALignType;
     width: number;
     isCombinationComponent: boolean;

package/dist/esm/components/BS/BsPosting/components/ReceiverMobile/index.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
-import { ComponentInterface, PickOption, ALignType, Record } from '../../../../../type';
+import React from "react";
+import { ComponentInterface, PickOption, ALignType, Record, ColumnConfig } from "../../../../../type";
 declare class ReceiverMobile implements ComponentInterface {
     name: string;
     id: string;
@@ -14,7 +14,8 @@ declare class ReceiverMobile implements ComponentInterface {
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface['dataType'];
+    dataType: ComponentInterface["dataType"];
+    parentName?: string;
     constructor(options: PickOption);
     renderClient: (record: Record) => React.JSX.Element | null;
     renderPc: (value: unknown, record: Record) => any;
@@ -22,6 +23,13 @@ declare class ReceiverMobile implements ComponentInterface {
     renderExport: (value?: string) => string;
     getComponentValue: (r: Record) => any;
     editRender: () => null;
-    filterConfig: () => never[];
+    filterConfig: (item: ColumnConfig) => {
+        searchDefaultConditions: "in";
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        formatFilterValue: (input: string) => string | string[];
+    } | null;
 }
 export default ReceiverMobile;

package/dist/esm/components/BS/BsPosting/components/ReceiverMobile/index.js

@@ -5,9 +5,10 @@ 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 { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import React from "react";
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import ItemView from "../../../../../commonComponents/ItemView";
+import { SYMBOL, batchInput } from "../../../../../constant";
 var ReceiverMobile = /*#__PURE__*/_createClass(function ReceiverMobile(options) {
   var _this = this;
   _classCallCheck(this, ReceiverMobile);
@@ -25,6 +26,7 @@ var ReceiverMobile = /*#__PURE__*/_createClass(function ReceiverMobile(options)
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "parentName", void 0);
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
@@ -34,13 +36,13 @@ var ReceiverMobile = /*#__PURE__*/_createClass(function ReceiverMobile(options)
   });
   _defineProperty(this, "renderPc", function (value, record) {
     var _record;
-    return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : '--';
+    return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : "--";
   });
   _defineProperty(this, "renderLog", function (r) {
     return r === null || r === void 0 ? void 0 : r[_this.id];
   });
   _defineProperty(this, "renderExport", function (value) {
-    return value !== null && value !== void 0 ? value : '--';
+    return value !== null && value !== void 0 ? value : "--";
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return r === null || r === void 0 ? void 0 : r["".concat(_this.id)];
@@ -48,8 +50,17 @@ var ReceiverMobile = /*#__PURE__*/_createClass(function ReceiverMobile(options)
   _defineProperty(this, "editRender", function () {
     return null;
   });
-  _defineProperty(this, "filterConfig", function () {
-    return [];
+  _defineProperty(this, "filterConfig", function (item) {
+    return _this.parentName ? {
+      searchDefaultConditions: SYMBOL.in,
+      type: item.type,
+      id: "".concat(_this.id),
+      name: "".concat(_this.parentName, "-").concat(_this.name),
+      filterComponentType: "Input",
+      formatFilterValue: function formatFilterValue(input) {
+        return batchInput(input);
+      }
+    } : null;
   });
   this.name = options.name;
   this.id = options.id;
@@ -59,12 +70,14 @@ var ReceiverMobile = /*#__PURE__*/_createClass(function ReceiverMobile(options)
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];
-  this.align = 'left';
-  this.dataType = 'string';
+  this.align = "left";
+  this.dataType = "string";
   this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
   this.effects = options === null || options === void 0 ? void 0 : options.effects;
   this.rules = [];
   this.width = 180; // TODO: 针对子组件，必须拥有width属性,否则就会出现多列展示问题
+  if (options.parentName) {
+    this.parentName = options.parentName;
+  }
 });
-
 export default ReceiverMobile;

package/dist/esm/components/BS/BsPosting/components/ReceiverName/index.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
-import { ComponentInterface, PickOption, ALignType, Record } from '../../../../../type';
+import React from "react";
+import { ComponentInterface, PickOption, ALignType, Record, ColumnConfig } from "../../../../../type";
 declare class ReceiverName implements ComponentInterface {
     name: string;
     id: string;
@@ -14,7 +14,8 @@ declare class ReceiverName implements ComponentInterface {
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface['dataType'];
+    dataType: ComponentInterface["dataType"];
+    parentName?: string;
     constructor(options: PickOption);
     renderClient: (record: Record) => React.JSX.Element | null;
     renderPc: (value: unknown, record: Record) => any;
@@ -22,6 +23,13 @@ declare class ReceiverName implements ComponentInterface {
     renderExport: (value?: string) => string;
     getComponentValue: (r: Record) => any;
     editRender: () => null;
-    filterConfig: () => never[];
+    filterConfig: (item: ColumnConfig) => {
+        searchDefaultConditions: "in";
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        formatFilterValue: (input: string) => string | string[];
+    } | null;
 }
 export default ReceiverName;

package/dist/esm/components/BS/BsPosting/components/ReceiverName/index.js

@@ -5,9 +5,10 @@ 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 { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import React from "react";
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import ItemView from "../../../../../commonComponents/ItemView";
+import { SYMBOL, batchInput } from "../../../../../constant";
 var ReceiverName = /*#__PURE__*/_createClass(function ReceiverName(options) {
   var _this = this;
   _classCallCheck(this, ReceiverName);
@@ -25,6 +26,7 @@ var ReceiverName = /*#__PURE__*/_createClass(function ReceiverName(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "parentName", void 0);
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
@@ -34,13 +36,13 @@ var ReceiverName = /*#__PURE__*/_createClass(function ReceiverName(options) {
   });
   _defineProperty(this, "renderPc", function (value, record) {
     var _record;
-    return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : '--';
+    return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : "--";
   });
   _defineProperty(this, "renderLog", function (r) {
     return r === null || r === void 0 ? void 0 : r[_this.id];
   });
   _defineProperty(this, "renderExport", function (value) {
-    return value !== null && value !== void 0 ? value : '--';
+    return value !== null && value !== void 0 ? value : "--";
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return r === null || r === void 0 ? void 0 : r["".concat(_this.id)];
@@ -48,8 +50,17 @@ var ReceiverName = /*#__PURE__*/_createClass(function ReceiverName(options) {
   _defineProperty(this, "editRender", function () {
     return null;
   });
-  _defineProperty(this, "filterConfig", function () {
-    return [];
+  _defineProperty(this, "filterConfig", function (item) {
+    return _this.parentName ? {
+      searchDefaultConditions: SYMBOL.in,
+      type: item.type,
+      id: "".concat(_this.id),
+      name: "".concat(_this.parentName, "-").concat(_this.name),
+      filterComponentType: "Input",
+      formatFilterValue: function formatFilterValue(input) {
+        return batchInput(input);
+      }
+    } : null;
   });
   this.name = options.name;
   this.id = options.id;
@@ -59,12 +70,14 @@ var ReceiverName = /*#__PURE__*/_createClass(function ReceiverName(options) {
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];
-  this.align = 'left';
-  this.dataType = 'string';
+  this.align = "left";
+  this.dataType = "string";
   this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
   this.effects = options === null || options === void 0 ? void 0 : options.effects;
   this.rules = [];
   this.width = 180; // TODO: 针对子组件，必须拥有width属性,否则就会出现多列展示问题
+  if (options.parentName) {
+    this.parentName = options.parentName;
+  }
 });
-
 export default ReceiverName;

package/dist/esm/components/BS/common/BsHeaderChild.d.ts

@@ -1,18 +1,18 @@
-import { ComponentInterface, PickOption, ALignType, Record } from "../../../type";
-import React from "react";
+import { ComponentInterface, PickOption, ALignType, Record } from '../../../type';
+import React from 'react';
 declare class BsHeaderChild implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
-    componentConfig: ComponentInterface["componentConfig"];
+    componentConfig: ComponentInterface['componentConfig'];
     align: ALignType;
     width: number;
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface["dataType"];
+    dataType: ComponentInterface['dataType'];
     parentName?: string;
     transformValue: (val: any, record?: any, parentName?: string) => any;
     export: (val: any, record?: any, parentName?: string) => any;

package/dist/esm/components/BS/common/BsHeaderChild.js

@@ -11,9 +11,9 @@ 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 ItemView from "../../../commonComponents/ItemView";
-import { isNull } from "@kmkf-fe-packages/kmkf-utils";
+import { isNull } from '@kmkf-fe-packages/kmkf-utils';
 var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
   var _this = this;
   _classCallCheck(this, BsHeaderChild);
@@ -37,7 +37,7 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
     return val;
   });
   _defineProperty(this, "getParentId", function () {
-    var _this$id$split = _this.id.split("_"),
+    var _this$id$split = _this.id.split('_'),
       _this$id$split2 = _slicedToArray(_this$id$split, 3),
       key = _this$id$split2[0],
       name = _this$id$split2[1],
@@ -53,7 +53,7 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
   });
   _defineProperty(this, "renderPc", function (value, record) {
     var _this$getComponentVal;
-    return /*#__PURE__*/React.createElement("span", null, (_this$getComponentVal = _this.getComponentValue(record)) !== null && _this$getComponentVal !== void 0 ? _this$getComponentVal : "--");
+    return /*#__PURE__*/React.createElement("span", null, (_this$getComponentVal = _this.getComponentValue(record)) !== null && _this$getComponentVal !== void 0 ? _this$getComponentVal : '--');
   });
   _defineProperty(this, "renderLog", function (r) {
     var id = _this.getParentId();
@@ -68,8 +68,8 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var _this$getComponentExp;
-    var val = (_this$getComponentExp = _this.getComponentExport(record)) !== null && _this$getComponentExp !== void 0 ? _this$getComponentExp : "--";
-    return typeof val === "number" ? val + "" : val;
+    var val = (_this$getComponentExp = _this.getComponentExport(record)) !== null && _this$getComponentExp !== void 0 ? _this$getComponentExp : '--';
+    return typeof val === 'number' ? val + '' : val;
   });
   _defineProperty(this, "editRender", function () {
     return null;
@@ -86,11 +86,11 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
     this.parentName = options.parentName;
   }
   this.componentConfig = options.componentConfig;
-  this.align = "left";
+  this.align = 'left';
   this.width = (options === null || options === void 0 ? void 0 : options.width) || 100;
   this.isCombinationComponent = false;
   this.canSort = false;
-  this.dataType = "string";
+  this.dataType = 'string';
   this.children = [];
   if (options.transformValue) {
     this.transformValue = options.transformValue;
@@ -98,7 +98,5 @@ var BsHeaderChild = /*#__PURE__*/_createClass(function BsHeaderChild(options) {
   if (options.renderExport) {
     this.export = options.renderExport;
   }
-  // this.export = (options as any).renderExport;
 });
-
 export default BsHeaderChild;

package/dist/esm/components/BS/common/BsHeaderPic.d.ts

@@ -1,23 +1,23 @@
-import { ComponentInterface, PickOption, ALignType, Record } from '../../../type';
-import React from 'react';
+import { ComponentInterface, PickOption, ALignType, Record } from "../../../type";
+import React from "react";
 declare class BsChildPic implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
-    componentConfig: ComponentInterface['componentConfig'];
+    componentConfig: ComponentInterface["componentConfig"];
     align: ALignType;
     width: number;
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface['dataType'];
+    dataType: ComponentInterface["dataType"];
     constructor(options: PickOption);
     getParentId: () => string;
     renderClient: (record: any) => React.JSX.Element | null;
-    renderPc: (value: unknown, record: Record) => React.JSX.Element | React.JSX.Element[];
-    renderLog: (r: Record) => React.JSX.Element | React.JSX.Element[] | null;
+    renderPc: (value: unknown, record: Record) => React.JSX.Element;
+    renderLog: (r: Record) => React.JSX.Element | null;
     getComponentValue: (r: Record) => any;
     renderExport: (value: string, record: Record) => any;
     editRender: () => null;

package/dist/esm/components/BS/common/BsHeaderPic.js

@@ -11,11 +11,10 @@ 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 { Image } from 'antd';
+import React from "react";
+import { Image } from "antd";
 import ItemView from "../../../commonComponents/ItemView";
-import { BsGoodPic } from "../../Common";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 var BsChildPic = /*#__PURE__*/_createClass(function BsChildPic(options) {
   var _this = this;
   _classCallCheck(this, BsChildPic);
@@ -32,7 +31,7 @@ var BsChildPic = /*#__PURE__*/_createClass(function BsChildPic(options) {
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "getParentId", function () {
-    var _this$id$split = _this.id.split('_'),
+    var _this$id$split = _this.id.split("_"),
       _this$id$split2 = _slicedToArray(_this$id$split, 3),
       key = _this$id$split2[0],
       name = _this$id$split2[1],
@@ -47,7 +46,6 @@ var BsChildPic = /*#__PURE__*/_createClass(function BsChildPic(options) {
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
-    var _BsGoodPic;
     return /*#__PURE__*/React.createElement("span", {
       onClick: function onClick(e) {
         return e.stopPropagation();
@@ -56,7 +54,6 @@ var BsChildPic = /*#__PURE__*/_createClass(function BsChildPic(options) {
       width: 60,
       src: _this.getComponentValue(record)
     }));
-    return (_BsGoodPic = BsGoodPic(_this.getComponentValue(record))) !== null && _BsGoodPic !== void 0 ? _BsGoodPic : '--';
   });
   _defineProperty(this, "renderLog", function (r) {
     var id = _this.getParentId();
@@ -65,16 +62,10 @@ var BsChildPic = /*#__PURE__*/_createClass(function BsChildPic(options) {
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return r === null || r === void 0 ? void 0 : r[_this.id];
-    var id = _this.getParentId();
-    var list = ((r === null || r === void 0 ? void 0 : r[id]) || []).reduce(function (prv, next) {
-      next['pic'] && prv.push(next['pic']);
-      return prv;
-    }, []);
-    return list;
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var _this$getComponentVal;
-    return (_this$getComponentVal = _this.getComponentValue(record)) !== null && _this$getComponentVal !== void 0 ? _this$getComponentVal : '--';
+    return (_this$getComponentVal = _this.getComponentValue(record)) !== null && _this$getComponentVal !== void 0 ? _this$getComponentVal : "--";
   });
   _defineProperty(this, "editRender", function () {
     return null;
@@ -88,11 +79,11 @@ var BsChildPic = /*#__PURE__*/_createClass(function BsChildPic(options) {
   this.formField = options.id;
   this.type = options.type;
   this.componentConfig = options.componentConfig;
-  this.align = 'left';
+  this.align = "left";
   this.width = 100;
   this.isCombinationComponent = false;
   this.canSort = false;
-  this.dataType = 'string';
+  this.dataType = "string";
   this.children = [];
 });
 export default BsChildPic;

package/dist/esm/components/BS/common/SystemOrderNo.js

@@ -18,6 +18,7 @@ var componentType = {
   WDT_REISSUE_GOODS: "wdtSystemOrderNo",
   BS_E3_REISSUE_GOODS: "bsE3SystemOrderNo",
   GY_REISSUE_GOODS: "gySystemOrderNo",
+  GY_RETURN_GOODS: "gySystemOrderNo",
   JST_REISSUE_GOODS: "jstSystemOrderNo",
   JST_RETURN_GOODS: "jstSystemOrderNo"
 };

package/dist/esm/components/Common/constants/columnsBaseInfoMap.js

@@ -9,18 +9,20 @@ import bs_e3 from "./bs_e3";
 import bs from "./bs";
 import wdt from "./wdt";
 import gy from "./gy";
-import { getJstColumns } from "@kmkf-fe-packages/basic-components";
+import { getJstColumns, getWlnColumns } from "@kmkf-fe-packages/basic-components";
 import defaultColumns from "./defaultColumns";
 export var getColumnsMap = function getColumnsMap(args) {
   var _ref = args || {},
     _ref$text = _ref.text,
     text = _ref$text === void 0 ? "" : _ref$text;
-  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, system()), bs({
+  return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, system()), bs({
     text: text
   })), bs_e3()), wdt({
     text: text
   })), gy()), getJstColumns({
     disabled: true
+  })), getWlnColumns({
+    text: text
   })), {}, {
     default: defaultColumns({
       text: text