@kmkf-fe-packages/services-components 0.6.3-alpha.5 → 0.6.3-alpha.50

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

@@ -26,6 +26,7 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
   _defineProperty(this, "componentConfig", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "children", void 0);
+  _defineProperty(this, "dataMap", void 0);
   _defineProperty(this, "render", function (value) {
     return /*#__PURE__*/React.createElement("span", null, Array.isArray(value) ? value.join('~') : /*#__PURE__*/React.createElement("span", null, value));
   });
@@ -39,13 +40,16 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
   _defineProperty(this, "renderPc", function (value, record) {
     var _record;
     var type = _this.type;
-    var map = {
-      TRADE_CREATE_DATETIME: 'tradeCreateDateTime',
-      TRADE_PAYMENT_DATETIME: 'tradePaymentDateTime',
-      TRADE_DELIVERY_DATETIME: 'tradeDeliveryDateTime',
-      TRADE_CLOSING_DATETIME: 'tradeClosingDateTime'
-    };
-    return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(map[type])]) !== null && _record !== void 0 ? _record : '--');
+    return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_").concat(_this.dataMap[type])]) !== null && _record !== void 0 ? _record : '--');
+  });
+  _defineProperty(this, "renderLog", function (r) {
+    var type = _this.type;
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(_this.dataMap[type])])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    var type = _this.type;
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_").concat(_this.dataMap[type])];
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var _record2;
@@ -86,6 +90,7 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
   });
   _defineProperty(this, "filterConfig", function (item) {
     return {
+      type: item.type,
       id: item.id,
       // 过滤组件id
       name: item.name,
@@ -112,5 +117,11 @@ var BasicDataTime = /*#__PURE__*/_createClass(function BasicDataTime(options) {
   this.rules = [];
   this.isCombinationComponent = false;
   this.children = [];
+  this.dataMap = {
+    TRADE_CREATE_DATETIME: 'tradeCreateDateTime',
+    TRADE_PAYMENT_DATETIME: 'tradePaymentDateTime',
+    TRADE_DELIVERY_DATETIME: 'tradeDeliveryDateTime',
+    TRADE_CLOSING_DATETIME: 'tradeClosingDateTime'
+  };
 });
 export default BasicDataTime;

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

@@ -16,16 +16,18 @@ declare class ETradeId implements ComponentInterface {
     isCombinationComponent: boolean;
     children: ComponentInterface[];
     constructor(options: PickOption);
-    render: (value: string) => JSX.Element;
     renderClient: (record: any) => JSX.Element | null;
     renderPc: (value: unknown, record: Record) => JSX.Element;
+    renderLog: (r: Record) => JSX.Element | null;
+    getComponentValue: (r: Record) => any;
     renderExport: (value: unknown, record: Record) => any;
     editRender: (value: any) => JSX.Element;
     filterConfig: (item: ColumnConfig) => {
+        type: string;
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => any;
+        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default ETradeId;

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

@@ -28,20 +28,24 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
   _defineProperty(this, "effects", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "children", void 0);
-  _defineProperty(this, "render", function (value) {
-    return /*#__PURE__*/React.createElement("span", null, value);
-  });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id])
+      value: record === null || record === void 0 ? void 0 : record[_this.id]
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
     var _record;
     return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_tradeId")]) !== null && _record !== void 0 ? _record : '--');
   });
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_tradeId")])) return null;
+    return _this.renderPc(undefined, r);
+  });
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_tradeId")];
+  });
   _defineProperty(this, "renderExport", function (value, record) {
     var _record2;
     return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_tradeId")]) !== null && _record2 !== void 0 ? _record2 : '--';
@@ -67,6 +71,7 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
   });
   _defineProperty(this, "filterConfig", function (item) {
     return {
+      type: item.type,
       id: item.id,
       // 过滤组件id
       name: item.name,

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

@@ -12,11 +12,13 @@ declare class WorkOrderId implements ComponentInterface {
     constructor(options: PickOption);
     copyHandle: (text: string) => void;
     renderPc: (value: any, record: any) => JSX.Element;
+    renderLog: (r: Record) => JSX.Element | null;
+    getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: any) => any;
-    render: () => null;
     renderClient: () => null;
     editRender: () => JSX.Element;
     filterConfig: (item: ColumnConfig) => {
+        type: string;
         id: string;
         name: string;
         filterComponentType: "Input";

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

@@ -10,7 +10,7 @@ import React from 'react';
 import { message } from 'antd';
 import { CopyOutlined } from '@ant-design/icons';
 import { ApaasInput } from '@kmkf-fe-packages/basic-components';
-import { filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { filterFn as _filterFn, isNull } from '@kmkf-fe-packages/kmkf-utils';
 import GetFormItem from "../GetFormItem";
 import repeatPng from "./img/repeat.png";
 import copy from 'copy-to-clipboard';
@@ -30,7 +30,10 @@ var WorkOrderId = /*#__PURE__*/_createClass(function WorkOrderId(options) {
     message.success('复制成功');
   });
   _defineProperty(this, "renderPc", function (value, record) {
-    var _record$repeatConfig, _record;
+    var _record$repeatConfig;
+    if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) === undefined) {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, "--");
+    }
     return /*#__PURE__*/React.createElement("span", null, (record === null || record === void 0 ? void 0 : (_record$repeatConfig = record.repeatConfig) === null || _record$repeatConfig === void 0 ? void 0 : _record$repeatConfig.show) && /*#__PURE__*/React.createElement("img", {
       src: repeatPng,
       style: {
@@ -41,7 +44,7 @@ var WorkOrderId = /*#__PURE__*/_createClass(function WorkOrderId(options) {
         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.handleOpenRepeatList) === 'function' && (_this === null || _this === void 0 ? void 0 : (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.handleOpenRepeatList(record === null || record === void 0 ? void 0 : record.repeatConfig));
       }
-    }), (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : '--', (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) && /*#__PURE__*/React.createElement(React.Fragment, null, record === null || record === void 0 ? void 0 : record["".concat(_this.id)], /*#__PURE__*/React.createElement("span", {
+    }), /*#__PURE__*/React.createElement(React.Fragment, null, record === null || record === void 0 ? void 0 : record["".concat(_this.id)], /*#__PURE__*/React.createElement("span", {
       onClick: function onClick() {
         return _this.copyHandle(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]);
       }
@@ -52,12 +55,16 @@ var WorkOrderId = /*#__PURE__*/_createClass(function WorkOrderId(options) {
       }
     }, /*#__PURE__*/React.createElement(CopyOutlined, null)))));
   });
-  _defineProperty(this, "renderExport", function (value, record) {
-    var _record2;
-    return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record2 !== void 0 ? _record2 : '--';
+  _defineProperty(this, "renderLog", function (r) {
+    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id)])) return null;
+    return _this.renderPc(undefined, r);
   });
-  _defineProperty(this, "render", function () {
-    return null;
+  _defineProperty(this, "getComponentValue", function (r) {
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id)];
+  });
+  _defineProperty(this, "renderExport", function (value, record) {
+    var _record;
+    return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : '--';
   });
   _defineProperty(this, "renderClient", function () {
     return null;
@@ -76,6 +83,7 @@ var WorkOrderId = /*#__PURE__*/_createClass(function WorkOrderId(options) {
   });
   _defineProperty(this, "filterConfig", function (item) {
     return {
+      type: item.type,
       id: item.id,
       // 过滤组件id
       name: item.name,
@@ -92,6 +100,7 @@ var WorkOrderId = /*#__PURE__*/_createClass(function WorkOrderId(options) {
   this.id = options.id;
   this.type = options.type;
   this.componentConfig = options.componentConfig;
+  this.effects = options.effects;
   this.rules = [];
   this.isCombinationComponent = false;
   this.children = [];

package/dist/esm/index.d.ts

@@ -47,3 +47,5 @@ export { default as CompletedUser } from './components/CompletedUser';
 export { factory } from './factory';
 export { default as PlatformAvatar } from './commonComponents/PlatformAvatar';
 export { default as ShopList } from './commonComponents/ShopList';
+export { default as OperationLog } from './commonComponents/OperationLog';
+export { default as GetFormItem } from './components/GetFormItem';

package/dist/esm/index.js

@@ -46,4 +46,6 @@ export { default as Handler } from "./components/Handler";
 export { default as CompletedUser } from "./components/CompletedUser";
 export { factory } from "./factory";
 export { default as PlatformAvatar } from "./commonComponents/PlatformAvatar";
-export { default as ShopList } from "./commonComponents/ShopList";
+export { default as ShopList } from "./commonComponents/ShopList";
+export { default as OperationLog } from "./commonComponents/OperationLog";
+export { default as GetFormItem } from "./components/GetFormItem";

package/dist/esm/type.d.ts

@@ -1,18 +1,19 @@
 /// <reference types="react" />
-import type { FormInstance } from 'antd';
-export declare type DataType = 'string' | 'number' | 'array' | 'dateArray' | 'date' | 'tradeId';
-export declare type ALignType = 'left' | 'right' | 'center';
+import type { FormInstance } from "antd";
+export declare type DataType = "string" | "number" | "array" | "dateArray" | "date" | "tradeId";
+export declare type ALignType = "left" | "right" | "center";
 export declare type Record = {
     [props in string]: any;
 };
 export declare type FilterConfigType = {
+    type: string;
     id: string;
     name: string;
     options?: any[];
     filterComponentType: FilterComponentType;
     filterFn?: (p: any) => (r: Record) => unknown;
 };
-export declare type FilterComponentType = 'MultipleSelect' | 'Input' | 'Date' | 'Cascader' | 'ShopList';
+export declare type FilterComponentType = "MultipleSelect" | "Input" | "Date" | "Cascader" | "ShopList";
 export interface ComponentInterface {
     id: string;
     name: string;
@@ -25,7 +26,7 @@ export interface ComponentInterface {
     /**
      * @description 组件下标
      * @deprecated 已弃用字段,后续版本不在使用
-    */
+     */
     formItemIndex?: number;
     componentConfig?: {
         /**
@@ -43,7 +44,7 @@ export interface ComponentInterface {
         /**
          * @description 显示字段名称
          */
-        showField?: 'EXPRESS_COMPANY' | 'EXPRESS_WAYBILL_CODE' | 'all';
+        showField?: "EXPRESS_COMPANY" | "EXPRESS_WAYBILL_CODE" | "all";
         /**
          * @description 是否选择SKU
          */
@@ -63,7 +64,7 @@ export interface ComponentInterface {
         /**
          * @description 备注状态
          */
-        associatedType?: 'APPEND';
+        associatedType?: "APPEND";
         isAssociated?: boolean;
         isShowFlag?: boolean;
         /**
@@ -96,7 +97,7 @@ export interface ComponentInterface {
          * @description 时间初始值
          */
         dateTime?: string;
-        dateType?: 'DATE' | 'DATE_TIME' | 'DATE_RANGE' | 'DATE_TIME_RANGE';
+        dateType?: "DATE" | "DATE_TIME" | "DATE_RANGE" | "DATE_TIME_RANGE";
         maxSize?: number;
         basicGrade?: number;
         range?: number;
@@ -132,9 +133,12 @@ export interface ComponentInterface {
         }[];
     };
     /**
-     * 端上的日志模块需要使用
+     * 日志渲染
+     * @param value
+     * @param r
+     * @returns
      */
-    render: (value: any, r?: Record) => JSX.Element | null | JSX.Element[];
+    renderLog: (r: Record) => JSX.Element | null | JSX.Element[];
     /**
      * 客户端卡片字段渲染,record的格式为下面这种,可以直接使用
      * {
@@ -153,7 +157,7 @@ export interface ComponentInterface {
      * @param record
      * @returns
      */
-    renderPc: (value: any, record: Record) => JSX.Element | null | JSX.Element[];
+    renderPc: (value: unknown, record: Record) => JSX.Element | null | JSX.Element[];
     /**
      * 导出时渲染
      * @param p
@@ -165,13 +169,14 @@ export interface ComponentInterface {
         onBlur?: (p1: any, p2: any) => void;
     }) => JSX.Element | null;
     filterConfig: (p: ColumnConfig) => FilterConfigType | FilterConfigType[];
+    getComponentValue: (r: Record) => any;
 }
-export declare type PickOption = Pick<ComponentInterface, 'name' | 'id' | 'type' | 'componentConfig' | 'effects'>;
+export declare type PickOption = Pick<ComponentInterface, "name" | "id" | "type" | "componentConfig" | "effects">;
 export declare type ColumnConfig = {
     id: string;
     name: string;
     type: string;
     subKey?: string;
-    mode?: 'multiple';
-    config?: ComponentInterface['componentConfig'];
+    mode?: "multiple";
+    config?: ComponentInterface["componentConfig"];
 };

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.6.3-alpha.5",
+  "version": "0.6.3-alpha.50",
   "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.5",
-    "@kmkf-fe-packages/kmkf-utils": "^0.6.3-alpha.5"
+    "@kmkf-fe-packages/basic-components": "^0.6.3-alpha.50",
+    "@kmkf-fe-packages/kmkf-utils": "^0.6.3-alpha.50"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -35,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "ca5660b4c7b1e71a004456cfd3aa818c9591a6dc"
+  "gitHead": "44c0e5906bc15f6ccd0d959c45d17281849c7741"
 }