@kmkf-fe-packages/services-components 0.6.3-alpha.15 → 0.6.3-alpha.16

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

@@ -51,6 +51,7 @@ var OperationLog = function OperationLog(_ref) {
           } catch (e) {
             nxt[cur['uniqueKey']] = cur['content'];
           } finally {
+            // eslint-disable-next-line no-unsafe-finally
             return nxt;
           }
         }, {});
@@ -64,6 +65,7 @@ var OperationLog = function OperationLog(_ref) {
           } catch (e) {
             nxt[cur['uniqueKey']] = cur['oldContent'];
           } finally {
+            // eslint-disable-next-line no-unsafe-finally
             return nxt;
           }
         }, {});

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

@@ -14,13 +14,13 @@ declare class BasicCascader implements ComponentInterface {
      * @param value
      * @returns
      */
-    getValue: (value: any) => any;
+    getValue: (value: any) => string;
     render: (value: any) => JSX.Element;
     renderClient: (record: any) => JSX.Element | null;
     renderPc: (value: any, record: Record) => JSX.Element;
     renderLog: (r: Record) => JSX.Element | null;
     getComponentValue: (r: Record) => any;
-    renderExport: (value: any, record: Record) => any;
+    renderExport: (value: any, record: Record) => string;
     editRender: (value: any) => JSX.Element;
     filterConfig: (item: ColumnConfig) => {
         id: string;

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

@@ -24,7 +24,7 @@ declare class CommonDataTime implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Date";
-        filterFn: (value: string[]) => (i: Record) => any;
+        filterFn: (value: string[]) => (i: Record) => boolean;
     };
 }
 export default CommonDataTime;

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

@@ -24,7 +24,7 @@ declare class BasicDataTime implements ComponentInterface {
         name: string;
         filterComponentType: "Date";
         options: any[];
-        filterFn: (value: string[]) => (i: Record) => any;
+        filterFn: (value: string[]) => (i: Record) => boolean;
     };
 }
 export default BasicDataTime;

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

@@ -20,7 +20,7 @@ declare class ErpTradeId implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => any;
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default ErpTradeId;

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

@@ -18,7 +18,7 @@ declare class Express implements ComponentInterface {
     renderPc: (value: unknown, record: Record) => JSX.Element;
     renderLog: (r: Record) => JSX.Element | null;
     getComponentValue: (r: Record) => any;
-    renderExport: (value: string, record: Record) => any;
+    renderExport: (value: string, record: Record) => string | number;
     editRender: () => JSX.Element;
     filterConfig: (item: ColumnConfig) => {
         id: string;

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

@@ -22,7 +22,7 @@ declare class ExpressCode implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => any;
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default ExpressCode;

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

@@ -6,6 +6,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 intersection from 'lodash/intersection';
 import { filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 var Handler = /*#__PURE__*/_createClass(function Handler(options) {
   var _this = this;
@@ -56,7 +57,10 @@ var Handler = /*#__PURE__*/_createClass(function Handler(options) {
       options: ((_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.userList) || [],
       filterFn: function filterFn(value) {
         return function (i) {
-          return value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id, ''));
+          var _ref;
+          return intersection(value, (_ref = _filterFn.filterTableListItemColumnValue(i, item.id) || []) === null || _ref === void 0 ? void 0 : _ref.map(function (item) {
+            return item === null || item === void 0 ? void 0 : item.account;
+          })).length > 0;
         };
       }
     };

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

@@ -23,7 +23,7 @@ declare class JstLogistics implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => any;
+        filterFn: (value: string) => (i: Record) => boolean;
         options?: undefined;
     } | {
         id: string;

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

@@ -35,7 +35,7 @@ declare class Logistics implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => any;
+        filterFn: (value: string) => (i: Record) => boolean;
     })[];
 }
 export default Logistics;

package/dist/esm/components/LogisticsInterception/InterceptAddress.d.ts

@@ -13,7 +13,7 @@ declare class PaymentTid implements ComponentInterface {
     isCombinationComponent: boolean;
     children: ComponentInterface[];
     originId: string;
-    addressDateInstance: AddressData;
+    addressDateInstance: typeof AddressData;
     constructor(options: PickOption);
     render: (value: any, record: any) => JSX.Element | null;
     renderClient: (record: any) => JSX.Element | null;

package/dist/esm/components/LogisticsInterception/InterceptStatus.d.ts

@@ -13,9 +13,10 @@ declare class InterceptStatus implements ComponentInterface {
     width: number;
     isCombinationComponent: boolean;
     children: ComponentInterface[];
-    expressDataInstance: ExpressInterceptData;
+    expressDataInstance: typeof ExpressInterceptData;
     constructor(options: PickOption);
     render: (value: any, record: any) => JSX.Element;
+    getComponentValue: (r: Record) => any;
     renderClient: (record: any) => JSX.Element | null;
     renderPc: (value: any, record: Record) => any;
     renderLog: (r: Record) => any;

package/dist/esm/components/LogisticsInterception/InterceptStatus.js

@@ -27,6 +27,9 @@ var InterceptStatus = /*#__PURE__*/_createClass(function InterceptStatus(options
   _defineProperty(this, "render", function (value, record) {
     return /*#__PURE__*/React.createElement("span", null, "TODO");
   });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r[_this.id];
+  });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,

package/dist/esm/components/LogisticsInterception/InterceptType.d.ts

@@ -13,9 +13,10 @@ declare class InterceptType implements ComponentInterface {
     width: number;
     isCombinationComponent: boolean;
     children: ComponentInterface[];
-    expressDataInstance: ExpressInterceptData;
+    expressDataInstance: typeof ExpressInterceptData;
     constructor(options: PickOption);
     render: (value: any, record: any) => JSX.Element;
+    getComponentValue: (r: Record) => any;
     renderClient: (record: any) => JSX.Element | null;
     renderPc: (value: any, record: Record) => any;
     renderLog: (r: Record) => any;

package/dist/esm/components/LogisticsInterception/InterceptType.js

@@ -27,6 +27,9 @@ var InterceptType = /*#__PURE__*/_createClass(function InterceptType(options) {
   _defineProperty(this, "render", function (value, record) {
     return /*#__PURE__*/React.createElement("span", null, "TODO");
   });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r[_this.id];
+  });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,

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

@@ -19,8 +19,8 @@ declare class Logistics implements ComponentInterface {
     children: ComponentInterface[];
     express: Express;
     expressCode: ExpressCode;
-    expressDateInstance: ExpressData;
-    expressData: ExpressInterceptData;
+    expressDateInstance: typeof ExpressData;
+    expressInterceptData: typeof ExpressInterceptData;
     effects: ComponentInterface["effects"];
     constructor(options: PickOption);
     render: () => null;

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

@@ -33,7 +33,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
   _defineProperty(this, "express", void 0);
   _defineProperty(this, "expressCode", void 0);
   _defineProperty(this, "expressDateInstance", void 0);
-  _defineProperty(this, "expressData", void 0);
+  _defineProperty(this, "expressInterceptData", void 0);
   _defineProperty(this, "effects", void 0);
   _defineProperty(this, "render", function () {
     return null;
@@ -62,7 +62,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
       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,
       component: /*#__PURE__*/React.createElement(LogisticsInterception, _extends({}, _this.componentConfig, {
         logisticsOptions: _this.expressDateInstance.getExpressData(),
-        expressInterceptData: _this.expressData.getExpressData(),
+        expressInterceptData: _this.expressInterceptData.getExpressData(),
         isEditing: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.isEditing,
         logisticsInterceptHandleStatus: ((_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : (_this$effects2$workOr = _this$effects2.workOrderDetail) === null || _this$effects2$workOr === void 0 ? void 0 : _this$effects2$workOr.logisticsInterceptHandleStatus) || ""
       }))
@@ -77,7 +77,7 @@ var Logistics = /*#__PURE__*/_createClass(function Logistics(options) {
   this.componentConfig = options.componentConfig;
   this.effects = options === null || options === void 0 ? void 0 : options.effects;
   this.expressDateInstance = ExpressData.getInstance();
-  this.expressData = ExpressInterceptData.getInstance();
+  this.expressInterceptData = ExpressInterceptData.getInstance();
   this.interceptAddress = new InterceptAddress(options);
   this.interceptType = new InterceptType(options);
   this.interceptStatus = new InterceptStatus(options);

package/dist/esm/components/Payment/AlipayNo.js

@@ -87,7 +87,7 @@ var AlipayNo = /*#__PURE__*/_createClass(function AlipayNo(options) {
   this.children = [];
   this.rules = [{
     validator: function validator(_, value) {
-      if (/^(?:1[3-9]\d{9}|[a-zA-Z\d._-]*\@[a-zA-Z\d.-]{1,10}\.[a-zA-Z\d]{1,20})$/.test(value)) {
+      if (/^(?:1[3-9]\d{9}|[a-zA-Z\d._-]*@[a-zA-Z\d.-]{1,10}\.[a-zA-Z\d]{1,20})$/.test(value)) {
         return Promise.resolve();
       }
       return Promise.reject(new Error('请输入有效的邮箱或者手机号'));

package/dist/esm/components/Payment/AlipayTime.d.ts

@@ -22,7 +22,7 @@ declare class AlipayTime implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string[]) => (i: Record) => any;
+        filterFn: (value: string[]) => (i: Record) => boolean;
     };
 }
 export default AlipayTime;

package/dist/esm/components/Payment/PaymentTid.d.ts

@@ -22,7 +22,7 @@ declare class PaymentTid implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => any;
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default PaymentTid;

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

@@ -42,7 +42,7 @@ declare class Logistics implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => any;
+        filterFn: (value: string) => (i: Record) => boolean;
     } | {
         id: string;
         name: string;
@@ -56,7 +56,7 @@ declare class Logistics implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string[]) => (i: Record) => any;
+        filterFn: (value: string[]) => (i: Record) => boolean;
     })[];
 }
 export default Logistics;

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

@@ -11,7 +11,7 @@ declare class PlatForm implements ComponentInterface {
     platInstance: PlatData;
     constructor();
     renderPc: (value: any, record: Record) => JSX.Element;
-    renderExport: (value: any, record: Record) => any;
+    renderExport: (value: any, record: Record) => string;
     renderLog: (r: Record) => JSX.Element | null;
     getComponentValue: (r: Record) => any;
     render: () => null;
@@ -22,7 +22,10 @@ declare class PlatForm implements ComponentInterface {
         name: string;
         filterComponentType: "MultipleSelect";
         filterFn: (value: string) => (i: Record) => boolean;
-        options: any;
+        options: {
+            label: string;
+            value: string;
+        }[];
     };
 }
 export default PlatForm;

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

@@ -40,7 +40,7 @@ declare class ReturnLogistics implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => any;
+        filterFn: (value: string) => (i: Record) => boolean;
     })[];
 }
 export default ReturnLogistics;

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

@@ -21,7 +21,7 @@ declare class SystemOrderNo implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => any;
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default SystemOrderNo;

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

@@ -28,7 +28,7 @@ declare class BasicDataTime implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Date";
-        filterFn: (value: string[]) => (i: Record) => any;
+        filterFn: (value: string[]) => (i: Record) => boolean;
     };
 }
 export default BasicDataTime;

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

@@ -27,7 +27,7 @@ declare class ETradeId implements ComponentInterface {
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => any;
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default ETradeId;

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.6.3-alpha.15",
+  "version": "0.6.3-alpha.16",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
     "dist"
   ],
   "scripts": {
-    "build": "father build"
+    "build": "yarn run lint && father build",
+    "lint": "eslint '**/*.{ts,tsx}'",
+    "lint:fix": "eslint --fix '**/*.{ts,tsx}'"
   },
   "lint-staged": {
     "*.{js,jsx,less,md,json}": [
@@ -18,11 +20,14 @@
     ]
   },
   "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^5.59.2",
+    "@typescript-eslint/parser": "^5.59.2",
+    "eslint": "^8.40.0",
     "father": "^4.1.7"
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^0.6.3-alpha.15",
-    "@kmkf-fe-packages/kmkf-utils": "^0.6.3-alpha.15"
+    "@kmkf-fe-packages/basic-components": "^0.6.3-alpha.16",
+    "@kmkf-fe-packages/kmkf-utils": "^0.6.3-alpha.16"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -35,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "48cd1f4dc355b1b386299c085845494a7068c374"
+  "gitHead": "b12616df54e56709922c3dc064f381f3032c0b73"
 }