@kmkf-fe-packages/services-components 0.8.19-alpha.0 → 0.8.19-alpha.2

package/dist/esm/components/BS/BsLogistics/index.d.ts

@@ -1,8 +1,8 @@
-import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from "../../../type";
-import React from "react";
-import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
-import ExpressCompany from "../common/expressCompany";
-import ExpressCode from "../common/expressCode";
+import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../../type';
+import React from 'react';
+import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
+import ExpressCompany from '../common/expressCompany';
+import ExpressCode from '../common/expressCode';
 declare class BsLogistics implements ComponentInterface {
     name: string;
     id: string;
@@ -15,14 +15,13 @@ declare class BsLogistics implements ComponentInterface {
     }[];
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface["componentConfig"];
-    align: ALignType;
+    componentConfig: ComponentInterface['componentConfig'];
     expressDateInstance: InstanceType<typeof ExpressData>;
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface["dataType"];
+    dataType: ComponentInterface['dataType'];
     expressCompany: ExpressCompany;
     expressCode: ExpressCode;
     constructor(options: PickOption);
@@ -49,7 +48,6 @@ declare class BsLogistics implements ComponentInterface {
         name: string;
         filterComponentType: "Input";
         filterFn: (value: string) => (i: Record) => boolean;
-        props?: undefined;
     })[];
 }
 export default BsLogistics;

package/dist/esm/components/BS/BsLogistics/index.js

@@ -8,23 +8,22 @@ 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 { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
-import some from "lodash/some";
+import React from 'react';
+import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
+import some from 'lodash/some';
 import GetFormItem from "../../GetFormItem";
 import { JstGoodImage } from "../../Common";
-import { JstGoods } from "@kmkf-fe-packages/basic-components";
+import { JstGoods } from '@kmkf-fe-packages/basic-components';
 import ItemView from "../../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
-import { SYMBOL } from "../../../constant";
+import { isNull } from '@kmkf-fe-packages/kmkf-utils';
 import ExpressCompany from "../common/expressCompany";
 import ExpressCode from "../common/expressCode";
 var typeMap = {
   BS_LOGISTICS: {
-    key: "bsLogisticsList",
-    name: "bs",
-    company: "bsLogisticsCompany",
-    code: "bsLogisticsCode"
+    key: 'bsLogisticsList',
+    name: 'bs',
+    company: 'bsLogisticsCompany',
+    code: 'bsLogisticsCode'
   }
 };
 var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(options) {
@@ -46,7 +45,6 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(options) {
   _defineProperty(this, "type", void 0);
   _defineProperty(this, "rules", void 0);
   _defineProperty(this, "componentConfig", void 0);
-  _defineProperty(this, "align", void 0);
   _defineProperty(this, "expressDateInstance", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "formField", void 0);
@@ -110,37 +108,11 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(options) {
   });
   _defineProperty(this, "filterConfig", function (item) {
     var _typeMap$_this$type4, _typeMap$_this$type5;
-    return [{
-      searchDefaultConditions: SYMBOL.in,
-      type: item.type,
-      id: "".concat(item.id, "_").concat((_typeMap$_this$type4 = typeMap[_this.type]) === null || _typeMap$_this$type4 === void 0 ? void 0 : _typeMap$_this$type4.company),
-      name: "".concat(_this.name, "\u7269\u6D41\u516C\u53F8"),
-      filterComponentType: "MultipleSelect",
-      props: {
-        options: _this.expressDateInstance.getExpressData() || []
-      },
-      filterFn: function filterFn(value) {
-        return function (i) {
-          var _ref;
-          return (_ref = _filterFn.filterTableListItemColumnValue(i, item.id, "logisticsCompany").split(",") || []) === null || _ref === void 0 ? void 0 : _ref.some(function (item) {
-            var _String;
-            var logisticsCompany = item ? (_String = String(item)) === null || _String === void 0 ? void 0 : _String.includes(value) : false;
-            return logisticsCompany;
-          });
-        };
-      }
-    }, {
-      searchDefaultConditions: SYMBOL.like,
-      type: item.type,
-      id: "".concat(item.id, "_").concat((_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.code),
-      name: "".concat(_this.name, "\u7269\u6D41\u5355\u53F7"),
-      filterComponentType: "Input",
-      filterFn: function filterFn(value) {
-        return function (i) {
-          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, "logisticsCode"), value);
-        };
-      }
-    }];
+    return [_this.expressCompany.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
+      subKey: (_typeMap$_this$type4 = typeMap[_this.type]) === null || _typeMap$_this$type4 === void 0 ? void 0 : _typeMap$_this$type4.company
+    })), _this.expressCode.filterConfig(_objectSpread(_objectSpread({}, item), {}, {
+      subKey: (_typeMap$_this$type5 = typeMap[_this.type]) === null || _typeMap$_this$type5 === void 0 ? void 0 : _typeMap$_this$type5.code
+    }))];
   });
   this.name = options.name;
   this.id = options.id;
@@ -151,15 +123,17 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(options) {
   this.isCombinationComponent = true;
   this.canSort = false;
   this.expressCompany = new ExpressCompany(_objectSpread(_objectSpread({}, options), {}, {
-    name: "物流公司",
-    id: "".concat(options.id, "_").concat((_typeMap$options$type3 = typeMap[options.type]) === null || _typeMap$options$type3 === void 0 ? void 0 : _typeMap$options$type3.key, "_").concat((_typeMap$options$type4 = typeMap[options.type]) === null || _typeMap$options$type4 === void 0 ? void 0 : _typeMap$options$type4.company)
+    name: '物流公司',
+    id: "".concat(options.id, "_").concat((_typeMap$options$type3 = typeMap[options.type]) === null || _typeMap$options$type3 === void 0 ? void 0 : _typeMap$options$type3.key, "_").concat((_typeMap$options$type4 = typeMap[options.type]) === null || _typeMap$options$type4 === void 0 ? void 0 : _typeMap$options$type4.company),
+    width: 200
   }));
   this.expressCode = new ExpressCode(_objectSpread(_objectSpread({}, options), {}, {
-    name: "物流单号",
-    id: "".concat(options.id, "_").concat((_typeMap$options$type5 = typeMap[options.type]) === null || _typeMap$options$type5 === void 0 ? void 0 : _typeMap$options$type5.key, "_").concat((_typeMap$options$type6 = typeMap[options.type]) === null || _typeMap$options$type6 === void 0 ? void 0 : _typeMap$options$type6.code)
+    name: '物流单号',
+    id: "".concat(options.id, "_").concat((_typeMap$options$type5 = typeMap[options.type]) === null || _typeMap$options$type5 === void 0 ? void 0 : _typeMap$options$type5.key, "_").concat((_typeMap$options$type6 = typeMap[options.type]) === null || _typeMap$options$type6 === void 0 ? void 0 : _typeMap$options$type6.code),
+    width: 200
   }));
   this.children = [this.expressCompany, this.expressCode];
-  this.dataType = "object";
+  this.dataType = 'object';
   this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
     required: true,
     validator: function validator(_, value) {
@@ -172,17 +146,16 @@ var BsLogistics = /*#__PURE__*/_createClass(function BsLogistics(options) {
       return Promise.resolve();
     }
   }] : [];
-  this.align = "left";
   this.expressDateInstance = ExpressData.getInstance();
   this.sortChildField = [{
-    name: "物流公司",
+    name: '物流公司',
     key: "".concat(options.id, "_").concat((_typeMap$options$type7 = typeMap[options.type]) === null || _typeMap$options$type7 === void 0 ? void 0 : _typeMap$options$type7.company),
     options: this.expressDateInstance.getExpressData(),
-    dataType: "string"
+    dataType: 'string'
   }, {
-    name: "物流单号",
+    name: '物流单号',
     key: "".concat(options.id, "_").concat((_typeMap$options$type8 = typeMap[options.type]) === null || _typeMap$options$type8 === void 0 ? void 0 : _typeMap$options$type8.code),
-    dataType: "string"
+    dataType: 'string'
   }];
 });
 export default BsLogistics;

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

@@ -1,4 +1,4 @@
-import { ComponentInterface, PickOption, ALignType, Record } from '../../../type';
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../../type';
 import React from 'react';
 declare class ExpressCode implements ComponentInterface {
     name: string;
@@ -21,6 +21,13 @@ declare class ExpressCode implements ComponentInterface {
     getComponentValue: (r: Record) => any;
     renderExport: (value: string, record: Record) => any;
     editRender: () => null;
-    filterConfig: () => never[];
+    filterConfig: (item: ColumnConfig) => {
+        searchDefaultConditions: "like";
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "Input";
+        filterFn: (value: string) => (i: Record) => boolean;
+    };
 }
 export default ExpressCode;

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

@@ -13,7 +13,8 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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 { BsExpressRender } from "../../Common";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { SYMBOL } from "../../../constant";
 var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {
   var _this = this,
     _this$componentConfig;
@@ -62,8 +63,20 @@ var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {
   _defineProperty(this, "editRender", function () {
     return null;
   });
-  _defineProperty(this, "filterConfig", function () {
-    return [];
+  _defineProperty(this, "filterConfig", function (item) {
+    var subKey = item.subKey;
+    return {
+      searchDefaultConditions: SYMBOL.like,
+      type: item.type,
+      id: "".concat(item.id, "_").concat(subKey),
+      name: "".concat(_this.name, "\u7269\u6D41\u5355\u53F7"),
+      filterComponentType: 'Input',
+      filterFn: function filterFn(value) {
+        return function (i) {
+          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, 'logisticsCode'), value);
+        };
+      }
+    };
   });
   this.name = options.name;
   this.id = options.id;
@@ -80,9 +93,9 @@ var ExpressCode = /*#__PURE__*/_createClass(function ExpressCode(options) {
     }
   }] : [];
   this.align = 'left';
-  this.width = 100;
+  this.width = (options === null || options === void 0 ? void 0 : options.width) || 150;
   this.isCombinationComponent = false;
-  this.canSort = true;
+  this.canSort = false;
   this.dataType = 'string';
   this.children = [];
 });

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

@@ -1,4 +1,4 @@
-import { ComponentInterface, PickOption, ALignType, Record } from '../../../type';
+import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from '../../../type';
 import React from 'react';
 import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
 declare class Express implements ComponentInterface {
@@ -24,6 +24,16 @@ declare class Express implements ComponentInterface {
     getComponentValue: (r: Record) => any;
     renderExport: (value: string, record: Record) => any;
     editRender: () => null;
-    filterConfig: () => never[];
+    filterConfig: (item: ColumnConfig) => {
+        searchDefaultConditions: "in";
+        type: string;
+        id: string;
+        name: string;
+        filterComponentType: "MultipleSelect";
+        props: {
+            options: any[];
+        };
+        filterFn: (value: string) => (i: Record) => any;
+    };
 }
 export default Express;

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

@@ -14,7 +14,8 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React from 'react';
 import { ExpressData } from '@kmkf-fe-packages/kmkf-utils';
 import { BsExpressRender } from "../../Common";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { SYMBOL } from "../../../constant";
 var Express = /*#__PURE__*/_createClass(function Express(options) {
   var _this = this;
   _classCallCheck(this, Express);
@@ -63,8 +64,28 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
   _defineProperty(this, "editRender", function () {
     return null;
   });
-  _defineProperty(this, "filterConfig", function () {
-    return [];
+  _defineProperty(this, "filterConfig", function (item) {
+    var subKey = item.subKey;
+    return {
+      searchDefaultConditions: SYMBOL.in,
+      type: item.type,
+      id: "".concat(item.id, "_").concat(subKey),
+      name: "".concat(_this.name),
+      filterComponentType: 'MultipleSelect',
+      props: {
+        options: _this.expressDateInstance.getExpressData() || []
+      },
+      filterFn: function filterFn(value) {
+        return function (i) {
+          var _ref;
+          return (_ref = _filterFn.filterTableListItemColumnValue(i, item.id, 'logisticsCompany').split(',') || []) === null || _ref === void 0 ? void 0 : _ref.some(function (item) {
+            var _String;
+            var logisticsCompany = item ? (_String = String(item)) === null || _String === void 0 ? void 0 : _String.includes(value) : false;
+            return logisticsCompany;
+          });
+        };
+      }
+    };
   });
   this.name = options.name;
   this.id = options.id;
@@ -75,9 +96,9 @@ var Express = /*#__PURE__*/_createClass(function Express(options) {
   this.rules = [];
   this.align = 'left';
   this.expressDateInstance = ExpressData.getInstance();
-  this.width = 100;
+  this.width = (options === null || options === void 0 ? void 0 : options.width) || 150;
   this.isCombinationComponent = false;
-  this.canSort = true;
+  this.canSort = false;
   this.children = [];
   this.dataType = 'string';
   this.options = this.expressDateInstance.getExpressData() || [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.8.19-alpha.0",
+  "version": "0.8.19-alpha.2",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -26,7 +26,7 @@
     "father": "^4.1.7"
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^0.8.19-alpha.0",
+    "@kmkf-fe-packages/basic-components": "^0.8.19-alpha.2",
     "@kmkf-fe-packages/kmkf-utils": "^0.8.19-alpha.0"
   },
   "peerDependencies": {
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "2ef041e1cfd8a5515a6a82d47b31b4bd5b110efe"
+  "gitHead": "76df2a097b11436a61008de980d5b4626ad93f90"
 }