@kmkf-fe-packages/services-components 0.6.3-alpha.9 → 0.7.0

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

@@ -22,9 +22,6 @@ var SystemOrderNo = /*#__PURE__*/_createClass(function SystemOrderNo(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,
@@ -47,7 +44,7 @@ var SystemOrderNo = /*#__PURE__*/_createClass(function SystemOrderNo(options) {
     var _record2;
     return (_record2 = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_systemOrderNo")]) !== null && _record2 !== void 0 ? _record2 : '--';
   });
-  _defineProperty(this, "editRender", function (value) {
+  _defineProperty(this, "editRender", function () {
     var _this$componentConfig, _this$componentConfig2;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
@@ -61,6 +58,7 @@ var SystemOrderNo = /*#__PURE__*/_createClass(function SystemOrderNo(options) {
   });
   _defineProperty(this, "filterConfig", function (item) {
     return {
+      type: item.type,
       id: item.id,
       // 过滤组件id
       name: item.name,

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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
+import React from 'react';
 declare class TemplateSelect implements ComponentInterface {
     name: string;
     id: string;
@@ -10,14 +10,14 @@ declare class TemplateSelect implements ComponentInterface {
     isCombinationComponent: boolean;
     children: ComponentInterface[];
     constructor(options: PickOption);
-    renderPc: (value: any, record: Record) => JSX.Element;
-    renderLog: (r: Record) => JSX.Element | null;
+    renderPc: (value: any, record: Record) => React.JSX.Element;
+    renderLog: (r: Record) => React.JSX.Element | null;
     getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: Record) => string;
-    render: () => null;
     renderClient: () => null;
-    editRender: (value: any) => null;
+    editRender: () => null;
     filterConfig: (item: ColumnConfig) => {
+        type: string;
         id: string;
         name: string;
         filterComponentType: "MultipleSelect";

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

@@ -49,18 +49,16 @@ var TemplateSelect = /*#__PURE__*/_createClass(function TemplateSelect(options)
     });
     return "".concat(get(item, 'fLabel'), "/").concat(get(item, 'label'));
   });
-  _defineProperty(this, "render", function () {
-    return null;
-  });
   _defineProperty(this, "renderClient", function () {
     return null;
   });
-  _defineProperty(this, "editRender", function (value) {
+  _defineProperty(this, "editRender", function () {
     return null;
   });
   _defineProperty(this, "filterConfig", function (item) {
     var _this$effects3;
     return {
+      type: item.type,
       id: item.id,
       // 过滤组件id
       name: item.name,

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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
+import React from 'react';
 declare class BasicInput implements ComponentInterface {
     name: string;
     id: string;
@@ -9,14 +9,14 @@ declare class BasicInput implements ComponentInterface {
     isCombinationComponent: boolean;
     children: ComponentInterface[];
     constructor(options: PickOption);
-    render: (value: string) => JSX.Element;
-    renderPc: (value: any, record: Record) => JSX.Element;
-    renderLog: (r: Record) => JSX.Element | null;
+    renderPc: (value: any, record: Record) => React.JSX.Element;
+    renderLog: (r: Record) => React.JSX.Element | null;
     getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: Record) => any;
-    renderClient: (record: Record) => JSX.Element | null;
-    editRender: () => JSX.Element;
+    renderClient: (record: Record) => React.JSX.Element | null;
+    editRender: () => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => {
+        type: string;
         id: string;
         name: string;
         filterComponentType: "Input";

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

@@ -21,9 +21,6 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
   _defineProperty(this, "componentConfig", 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, "renderPc", function (value, record) {
     var _record;
     return /*#__PURE__*/React.createElement("span", null, (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_textarea")]) !== null && _record !== void 0 ? _record : '--');
@@ -43,7 +40,7 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
     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, "editRender", function () {
@@ -60,6 +57,7 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
   });
   _defineProperty(this, "filterConfig", function (item) {
     return {
+      type: item.type,
       id: item.id,
       // 过滤组件id
       name: item.name,

package/dist/esm/components/ThirdItemSelect/ItemEncode.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { GoodsProps } from '@kmkf-fe-packages/basic-components/dist/common/Goods';
-declare const ItemEncode: (props: JSX.IntrinsicAttributes & GoodsProps) => JSX.Element;
+declare const ItemEncode: (props: JSX.IntrinsicAttributes & GoodsProps) => React.JSX.Element;
 export default ItemEncode;

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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
+import React from 'react';
 declare class ThirdItemSelect implements ComponentInterface {
     name: string;
     id: string;
@@ -10,14 +10,14 @@ declare class ThirdItemSelect implements ComponentInterface {
     isCombinationComponent: boolean;
     children: ComponentInterface[];
     constructor(options: PickOption);
-    render: (value: any) => JSX.Element;
-    renderClient: (record: Record) => JSX.Element | null;
-    renderPc: (value: any, record: Record) => JSX.Element;
-    renderLog: (r: Record) => JSX.Element | null;
+    renderClient: (record: Record) => React.JSX.Element | null;
+    renderPc: (value: any, record: Record) => React.JSX.Element;
+    renderLog: (r: Record) => React.JSX.Element | null;
     getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: Record) => any;
-    editRender: () => JSX.Element;
+    editRender: () => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => {
+        type: string;
         id: string;
         name: string;
         filterComponentType: "Input";

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

@@ -24,18 +24,14 @@ var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(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(GoodImage, {
-      list: value,
-      type: "itemThird"
-    });
-  });
   _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: /*#__PURE__*/React.createElement(GoodImage, {
+        list: record === null || record === void 0 ? void 0 : record[_this.id],
+        type: "itemThird"
+      })
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
@@ -80,6 +76,7 @@ var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(options
   });
   _defineProperty(this, "filterConfig", function (item) {
     return {
+      type: item.type,
       id: item.id,
       // 过滤组件id
       name: item.name,

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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { ComponentInterface, PickOption, DataType, Record, ColumnConfig } from '../../type';
+import React from 'react';
 declare type Value = string | string[] | undefined;
 declare class BasicDataTime implements ComponentInterface {
     name: string;
@@ -16,15 +16,16 @@ declare class BasicDataTime implements ComponentInterface {
     children: ComponentInterface[];
     dataMap: Record;
     constructor(options: PickOption);
-    render: (value: Value) => JSX.Element;
-    renderClient: (record: any) => JSX.Element | null;
-    renderPc: (value: unknown, record: Record) => JSX.Element;
-    renderLog: (r: Record) => JSX.Element | null;
+    render: (value: Value) => React.JSX.Element;
+    renderClient: (record: any) => 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: unknown, record: Record) => any;
-    editRender: () => JSX.Element;
+    editRender: () => React.JSX.Element;
     getKeyByComponentType: (type: string) => "tradeCreateDateTime" | "tradePaymentDateTime" | "tradeDeliveryDateTime" | "tradeClosingDateTime" | undefined;
     filterConfig: (item: ColumnConfig) => {
+        type: string;
         id: string;
         name: string;
         filterComponentType: "Date";

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

@@ -90,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,

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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { ComponentInterface, PickOption, DataType, Record, ColumnConfig } from '../../type';
+import React from 'react';
 declare class ETradeId implements ComponentInterface {
     name: string;
     id: string;
@@ -16,14 +16,14 @@ 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;
+    renderClient: (record: any) => 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: unknown, record: Record) => any;
-    editRender: (value: any) => JSX.Element;
+    editRender: (value: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => {
+        type: string;
         id: string;
         name: string;
         filterComponentType: "Input";

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

@@ -28,14 +28,11 @@ 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) {
@@ -74,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

@@ -1,5 +1,5 @@
-/// <reference types="react" />
 import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
+import React from 'react';
 declare class WorkOrderId implements ComponentInterface {
     name: string;
     id: string;
@@ -11,14 +11,14 @@ declare class WorkOrderId implements ComponentInterface {
     children: ComponentInterface[];
     constructor(options: PickOption);
     copyHandle: (text: string) => void;
-    renderPc: (value: any, record: any) => JSX.Element;
-    renderLog: (r: Record) => JSX.Element | null;
+    renderPc: (value: any, record: any) => React.JSX.Element;
+    renderLog: (r: Record) => React.JSX.Element | null;
     getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: any) => any;
-    render: () => null;
     renderClient: () => null;
-    editRender: () => JSX.Element;
+    editRender: () => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => {
+        type: string;
         id: string;
         name: string;
         filterComponentType: "Input";

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

@@ -66,9 +66,6 @@ var WorkOrderId = /*#__PURE__*/_createClass(function WorkOrderId(options) {
     var _record;
     return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : '--';
   });
-  _defineProperty(this, "render", function () {
-    return null;
-  });
   _defineProperty(this, "renderClient", function () {
     return null;
   });
@@ -86,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,

package/dist/esm/index.d.ts

@@ -46,5 +46,7 @@ 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 PlatBuyer } from './commonComponents/PlatBuyer';
 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,5 +46,7 @@ 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 PlatBuyer } from "./commonComponents/PlatBuyer";
 export { default as ShopList } from "./commonComponents/ShopList";
-export { default as OperationLog } from "./commonComponents/OperationLog";
+export { default as OperationLog } from "./commonComponents/OperationLog";
+export { default as GetFormItem } from "./components/GetFormItem";

package/dist/esm/type.d.ts

@@ -1,21 +1,23 @@
 /// <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;
+    columnHeader?: string | JSX.Element;
     type: string;
     isCombinationComponent: boolean;
     children: ComponentInterface[];
@@ -25,7 +27,7 @@ export interface ComponentInterface {
     /**
      * @description 组件下标
      * @deprecated 已弃用字段,后续版本不在使用
-    */
+     */
     formItemIndex?: number;
     componentConfig?: {
         /**
@@ -43,7 +45,7 @@ export interface ComponentInterface {
         /**
          * @description 显示字段名称
          */
-        showField?: 'EXPRESS_COMPANY' | 'EXPRESS_WAYBILL_CODE' | 'all';
+        showField?: "EXPRESS_COMPANY" | "EXPRESS_WAYBILL_CODE" | "all";
         /**
          * @description 是否选择SKU
          */
@@ -63,7 +65,7 @@ export interface ComponentInterface {
         /**
          * @description 备注状态
          */
-        associatedType?: 'APPEND';
+        associatedType?: "APPEND";
         isAssociated?: boolean;
         isShowFlag?: boolean;
         /**
@@ -96,7 +98,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;
@@ -138,10 +140,6 @@ export interface ComponentInterface {
      * @returns
      */
     renderLog: (r: Record) => JSX.Element | null | JSX.Element[];
-    /**
-     * 端上的日志模块需要使用
-     */
-    render: (value: any, r?: Record) => JSX.Element | null | JSX.Element[];
     /**
      * 客户端卡片字段渲染,record的格式为下面这种,可以直接使用
      * {
@@ -174,12 +172,12 @@ export interface ComponentInterface {
     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" | "columnHeader">;
 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.9",
+  "version": "0.7.0",
   "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.9"
+    "@kmkf-fe-packages/basic-components": "^0.7.0",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.0"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -35,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "f34f6e6a6c25cbdb64cafbd9d563f68be9734c5e"
+  "gitHead": "214345484eba96df7edb7f29f9205f2389f1debc"
 }