@kmkf-fe-packages/services-components 0.7.15-alpha.2 → 0.7.15-alpha.21

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

@@ -1,32 +1,31 @@
 import { ComponentInterface, PickOption, Record } from "../../type";
 import React from "react";
-declare type Value = string[] | undefined;
 declare class BasicFile implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
+    formField: string;
     type: string;
     rules: any[];
     componentConfig: ComponentInterface["componentConfig"];
     isCombinationComponent: boolean;
     canSort: boolean;
     children: ComponentInterface[];
+    dataType: ComponentInterface["dataType"];
     constructor(options: PickOption);
-    formatPictures: (pictures: string) => string[];
-    render: (value: Value) => React.JSX.Element | null;
-    renderPc: (value: any, record: Record) => React.JSX.Element | React.JSX.Element[];
-    renderLog: (r: Record) => React.JSX.Element | React.JSX.Element[] | null;
+    renderPc: (value: any, record: Record) => any;
+    renderLog: (r: Record) => any;
     getComponentValue: (r: Record) => any;
     renderClient: (record: any) => React.JSX.Element | null;
     editRender: () => React.JSX.Element;
     /**
      *
-     * @returns 图片类型的导出需要在导出时单独处理
+     * @returns
      */
-    renderExport: () => null;
+    renderExport: (value: any, record: any) => any;
     /**
      *
-     * @returns 图片不支持过滤
+     * @returns 文件不支持过滤
      */
     filterConfig: () => never[];
 }

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

@@ -7,9 +7,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 { Image } from "antd";
 import { ApaasUploadFile } from "@kmkf-fe-packages/basic-components";
-import { imgResize } from "@kmkf-fe-packages/kmkf-utils";
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
@@ -19,56 +17,23 @@ var BasicFile = /*#__PURE__*/_createClass(function BasicFile(options) {
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
   _defineProperty(this, "sortField", void 0);
+  _defineProperty(this, "formField", void 0);
   _defineProperty(this, "type", void 0);
   _defineProperty(this, "rules", void 0);
   _defineProperty(this, "componentConfig", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
-  _defineProperty(this, "formatPictures", function (pictures) {
-    pictures = pictures.replace(/[\[\]]/g, "");
-    pictures = pictures.replace(/\s/g, "");
-    return pictures ? pictures.split(",") : [];
-  });
-  _defineProperty(this, "render", function (value) {
-    if (!(value !== null && value !== void 0 && value.length)) {
-      return null;
-    }
-    return /*#__PURE__*/React.createElement("div", null, value === null || value === void 0 ? void 0 : value.map(function (pic) {
-      return /*#__PURE__*/React.createElement("div", {
-        style: {
-          marginRight: "5px",
-          display: "inline-block"
-        }
-      }, /*#__PURE__*/React.createElement(Image, {
-        width: 32,
-        src: imgResize(pic || ""),
-        preview: {
-          src: imgResize(pic || "", 0, 0)
-        }
-      }));
-    }));
-  });
+  _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "renderPc", function (value, record) {
-    if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_file")]) === undefined) {
+    var fileList = (record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_file")]) || [];
+    if (!fileList.length) {
       return /*#__PURE__*/React.createElement("span", null, "--");
     }
-    var finalPictures = _this.formatPictures(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_file")]).map(function (item) {
-      return "".concat(window.location.origin, "/").concat(item);
-    });
-    return finalPictures === null || finalPictures === void 0 ? void 0 : finalPictures.map(function (pic) {
-      return /*#__PURE__*/React.createElement("div", {
-        style: {
-          marginRight: "5px",
-          display: "inline-block"
-        }
-      }, /*#__PURE__*/React.createElement(Image, {
-        width: 32,
-        src: "".concat(pic, "?x-oss-process=image/resize,m_pad,h_40,w_40"),
-        preview: {
-          src: pic
-        }
-      }));
+    return fileList === null || fileList === void 0 ? void 0 : fileList.map(function (file) {
+      return /*#__PURE__*/React.createElement("a", {
+        href: file.url
+      }, file.name);
     });
   });
   _defineProperty(this, "renderLog", function (r) {
@@ -79,10 +44,10 @@ var BasicFile = /*#__PURE__*/_createClass(function BasicFile(options) {
     return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_file")];
   });
   _defineProperty(this, "renderClient", function (record) {
-    return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
+    return !isNull(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_file")]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id])
+      value: _this.renderPc(null, record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_file")])
     }) : null;
   });
   _defineProperty(this, "editRender", function () {
@@ -98,8 +63,12 @@ var BasicFile = /*#__PURE__*/_createClass(function BasicFile(options) {
       }))
     });
   });
-  _defineProperty(this, "renderExport", function () {
-    return null;
+  _defineProperty(this, "renderExport", function (value, record) {
+    var textArr = ((record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_rate")]) || []).reduce(function (prv, next) {
+      prv.push(next.url);
+      return prv;
+    }, []);
+    return textArr === null || textArr === void 0 ? void 0 : textArr.join(",");
   });
   _defineProperty(this, "filterConfig", function () {
     return [];
@@ -107,11 +76,13 @@ var BasicFile = /*#__PURE__*/_createClass(function BasicFile(options) {
   this.name = options.name;
   this.id = options.id;
   this.sortField = "".concat(options.id, "_file");
+  this.formField = "".concat(options.id, "_file");
   this.type = options.type;
   this.componentConfig = options.componentConfig;
   this.rules = [];
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];
+  this.dataType = "array";
 });
 export default BasicFile;

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

@@ -87,6 +87,9 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
   this.rules = [{
     validator: function validator(_, value) {
       var _this$componentConfig3, _this$componentConfig4, _this$componentConfig5;
+      if (!value) {
+        return Promise.resolve();
+      }
       var number = /^(([0-9]*(\.[0-9]{1,})$)|([0-9]+$))/;
       var mail = /^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+(.[a-zA-Z0-9_-]+)+$/;
       var phone = /^1\d{10}$/;

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

@@ -40,14 +40,12 @@ declare class LogisticsTrajectory implements ComponentInterface {
         props: {
             options: any[];
         };
-        filterFn: (value: string) => (i: Record) => boolean;
     } | {
         searchDefaultConditions: "like";
         type: string;
         id: string;
         name: string;
         filterComponentType: "Input";
-        filterFn: (value: string) => (i: Record) => boolean;
     })[];
 }
 export default LogisticsTrajectory;

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

@@ -91,24 +91,14 @@ var LogisticsTrajectory = /*#__PURE__*/_createClass(function LogisticsTrajectory
   this.isCombinationComponent = true;
   this.canSort = false;
   this.dataType = "object";
-  this.children = [this.express, this.expressCode];
+  this.children = [this.express, this.expressCode, this.expressSnapshot];
   this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
     validator: function validator(_, value) {
-      var _this$componentConfig4;
-      if ((_this$componentConfig4 = _this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.isSingle) {
-        var _this$componentConfig5, _this$componentConfig6;
-        if (((_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.showField) === "EXPRESS_COMPANY" && !(value !== null && value !== void 0 && value.company)) {
-          return Promise.reject(new Error("请选择物流公司"));
-        } else if (((_this$componentConfig6 = _this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.showField) === "EXPRESS_WAYBILL_CODE" && !(value !== null && value !== void 0 && value.order)) {
-          return Promise.reject(new Error("请输入物流单号"));
-        }
-      } else {
-        if (!(value !== null && value !== void 0 && value.company)) {
-          return Promise.reject(new Error("请选择物流公司"));
-        }
-        if (!(value !== null && value !== void 0 && value.order)) {
-          return Promise.reject(new Error("请输入物流单号"));
-        }
+      if (!value.trajectoryCompany) {
+        return Promise.reject(new Error("请选择物流公司"));
+      }
+      if (!value.trajectoryCode) {
+        return Promise.reject(new Error("请输入物流单号"));
       }
       return Promise.resolve();
     }

package/dist/esm/components/LogisticsTrajectory/trajectoryCode.js

@@ -33,6 +33,7 @@ var TrajectoryCode = /*#__PURE__*/_createClass(function TrajectoryCode(options)
     var company = record === null || record === void 0 ? void 0 : record["".concat(_this.parentId, "_trajectoryCompany")];
     var code = record === null || record === void 0 ? void 0 : record[_this.id];
     return /*#__PURE__*/React.createElement("div", null, code ? /*#__PURE__*/React.createElement(QueryLogisticsTrack, {
+      title: code,
       modelWidth: w,
       interceptCompany: company,
       interceptCode: code,
@@ -64,16 +65,15 @@ var TrajectoryCode = /*#__PURE__*/_createClass(function TrajectoryCode(options)
     return null;
   });
   _defineProperty(this, "filterConfig", function (item) {
-    var subKey = item.subKey;
     return {
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
-      id: subKey ? "".concat(item.id, "_").concat(subKey) : item.id,
+      id: "".concat(item.id, "_trajectoryCode"),
       name: "".concat(item.name, "-\u7269\u6D41\u5355\u53F7"),
       filterComponentType: "Input",
       filterFn: function filterFn(value) {
         return function (i) {
-          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, "".concat(subKey)), value);
+          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, "trajectoryCode"), value);
         };
       }
     };

package/dist/esm/components/LogisticsTrajectory/trajectoryCompany.d.ts

@@ -33,7 +33,6 @@ declare class TrajectoryCompany implements ComponentInterface {
         props: {
             options: any[];
         };
-        filterFn: (value: string) => (i: Record) => boolean;
     };
 }
 export default TrajectoryCompany;

package/dist/esm/components/LogisticsTrajectory/trajectoryCompany.js

@@ -8,7 +8,7 @@ function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input ==
 import React from "react";
 import { ExpressData } from "@kmkf-fe-packages/kmkf-utils";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL } from "../../constant";
 var TrajectoryCompany = /*#__PURE__*/_createClass(function TrajectoryCompany(options) {
   var _this = this;
@@ -55,20 +55,14 @@ var TrajectoryCompany = /*#__PURE__*/_createClass(function TrajectoryCompany(opt
     return null;
   });
   _defineProperty(this, "filterConfig", function (item) {
-    var subKey = item.subKey;
     return {
       searchDefaultConditions: SYMBOL.in,
       type: item.type,
-      id: subKey ? "".concat(item.id, "_").concat(subKey) : item.id,
+      id: item.id,
       name: "".concat(item.name, "-\u7269\u6D41\u516C\u53F8"),
       filterComponentType: "MultipleSelect",
       props: {
         options: _this.expressDateInstance.getExpressData() || []
-      },
-      filterFn: function filterFn(value) {
-        return function (i) {
-          return value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id, "".concat(subKey)));
-        };
       }
     };
   });

package/dist/esm/components/LogisticsTrajectory/trajectorySnapshot.d.ts

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

package/dist/esm/components/LogisticsTrajectory/trajectorySnapshot.js

@@ -7,7 +7,7 @@ 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 ItemView from "../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL } from "../../constant";
 var TrajectorySnapshot = /*#__PURE__*/_createClass(function TrajectorySnapshot(options) {
   var _this = this;
@@ -50,18 +50,12 @@ var TrajectorySnapshot = /*#__PURE__*/_createClass(function TrajectorySnapshot(o
     return null;
   });
   _defineProperty(this, "filterConfig", function (item) {
-    var subKey = item.subKey;
     return {
       searchDefaultConditions: SYMBOL.like,
       type: item.type,
-      id: subKey ? "".concat(item.id, "_").concat(subKey) : item.id,
+      id: item.id,
       name: "".concat(item.name, "-\u7269\u6D41\u5FEB\u7167"),
-      filterComponentType: "Input",
-      filterFn: function filterFn(value) {
-        return function (i) {
-          return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, "".concat(subKey)), value);
-        };
-      }
+      filterComponentType: "Input"
     };
   });
   this.name = options.name;

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

@@ -1,3 +1,3 @@
-/// <reference types="react" />
-declare const Popover: ({ Overlay, ShowComponent }: any) => JSX.Element;
+import React from 'react';
+declare const Popover: ({ Overlay, ShowComponent }: any) => React.JSX.Element;
 export default Popover;

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/factory.d.ts

@@ -1,3 +1,3 @@
 import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, CommonDataTime, TradeId, ShopName, ErpTradeId, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, BsLogistics, BsGoods, BsExchange, BsReissue } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ErpTradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | BsLogistics | BsGoods | BsExchange | BsReissue | FlowStatusSelect | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | ShopInput | Submitter | Handler | CompletedUser;
+export declare const factory: (type: string, options: PickOption) => ActualPayment | BsExchange | BsGoods | BsLogistics | BsReissue | BasicFile | BasicInput | JstItemSelect | JstLogistics | JstSendGood | JstSupply | LogisticsTrajectory | BasicPosting | BasicDataTime | TradeDateTime | BasicAddress | BasicCascader | BasicCheckbox | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | CommonDataTime | TradeId | ErpTradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | Logistics | ReturnLogistics | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | FlowStatusSelect | TemplateSelect | WorkOrderId | LogisticsInterception | PlatForm | ShopInput | Submitter | Handler | CompletedUser;

package/dist/esm/type.d.ts

@@ -137,6 +137,7 @@ export interface ComponentInterface {
          * @description 针对ERP的订单组件需要特殊展示，此处增加一个特殊标识
          */
         erpFlag?: boolean;
+        reasonList?: any[];
     };
     effects?: {
         queryWorkOrderDetail?: (r: Record) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.7.15-alpha.2",
+  "version": "0.7.15-alpha.21",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -26,8 +26,8 @@
     "father": "^4.1.7"
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^0.7.15-alpha.2",
-    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.0"
+    "@kmkf-fe-packages/basic-components": "^0.7.15-alpha.21",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.21"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "5ff2e36f84708b964271ed5e61c7ced26e266bd5"
+  "gitHead": "59a6403612e5a40684708eed9ff255d8e1928027"
 }

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

@@ -1,43 +0,0 @@
-import { ComponentInterface, PickOption, ColumnConfig, ALignType, Record } from "../../../type";
-import { ExpressInterceptData } from "@kmkf-fe-packages/kmkf-utils";
-declare class BsPic implements ComponentInterface {
-    name: string;
-    parentId: string;
-    id: string;
-    sortField: string;
-    type: string;
-    rules: any[];
-    componentConfig: ComponentInterface["componentConfig"];
-    effects: ComponentInterface["effects"];
-    align: ALignType;
-    width: number;
-    isCombinationComponent: boolean;
-    formField: string;
-    canSort: boolean;
-    children: ComponentInterface[];
-    expressInterceptInstance: InstanceType<typeof ExpressInterceptData>;
-    dataType: ComponentInterface["dataType"];
-    constructor(options: PickOption);
-    getComponentValue: (r: Record) => any;
-    renderClient: (record: any) => null;
-    renderPc: (value: any, record: Record) => null;
-    renderLog: (r: Record) => any;
-    renderExport: (value: any, record: Record) => any;
-    editRender: () => null;
-    filterConfig: (item: ColumnConfig) => {
-        searchDefaultConditions: "in";
-        type: string;
-        id: string;
-        name: string;
-        filterComponentType: "MultipleSelect";
-        props: {
-            options: {
-                label: string;
-                value: string;
-            }[];
-        };
-        formatFilterValue: (value: string[]) => string[];
-        filterFn: (value: string[]) => (i: Record) => boolean;
-    };
-}
-export default BsPic;