@kmkf-fe-packages/services-components 1.16.3-beta.0 → 1.16.3-beta.2

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

@@ -21,7 +21,7 @@ declare class FlowWorkOrderId implements ComponentInterface {
     renderClient: () => null;
     editRender: (p: any) => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => {
-        searchDefaultConditions: "like";
+        searchDefaultConditions: "eq";
         type: string;
         id: string;
         name: string;

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

@@ -70,7 +70,7 @@ var FlowWorkOrderId = /*#__PURE__*/_createClass(function FlowWorkOrderId(options
   });
   _defineProperty(this, "filterConfig", function (item) {
     return {
-      searchDefaultConditions: SYMBOL.like,
+      searchDefaultConditions: SYMBOL.eq,
       type: item.type,
       id: item.id,
       // 过滤组件id

package/dist/esm/components/JST/JstSupply/index.d.ts

@@ -4,6 +4,12 @@ declare class JstSupply implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
+    sortChildField: {
+        name: string;
+        key: string;
+        dataType: string;
+        [key: string]: any;
+    }[];
     type: string;
     rules: any[];
     componentConfig: ComponentInterface["componentConfig"];
@@ -14,6 +20,7 @@ declare class JstSupply implements ComponentInterface {
     children: ComponentInterface[];
     dataType: ComponentInterface["dataType"];
     constructor(options: PickOption);
+    getSortChildFields: (type: string, options: PickOption) => any;
     renderClient: (record: Record) => React.JSX.Element | null;
     renderPc: (value: any, record: Record) => React.JSX.Element;
     renderLog: (r: Record) => React.JSX.Element | null;

package/dist/esm/components/JST/JstSupply/index.js

@@ -14,13 +14,15 @@ 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";
-var JstSupply = /*#__PURE__*/_createClass(function JstSupply(options) {
+var JstSupply = /*#__PURE__*/_createClass(function JstSupply(_options) {
   var _this = this,
-    _this$componentConfig3;
+    _this$componentConfig3,
+    _this$componentConfig4;
   _classCallCheck(this, JstSupply);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
   _defineProperty(this, "sortField", void 0);
+  _defineProperty(this, "sortChildField", void 0);
   _defineProperty(this, "type", void 0);
   _defineProperty(this, "rules", void 0);
   _defineProperty(this, "componentConfig", void 0);
@@ -30,6 +32,34 @@ var JstSupply = /*#__PURE__*/_createClass(function JstSupply(options) {
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "getSortChildFields", function (type, options) {
+    if (!type) {
+      return [{
+        name: "jst供销商名称",
+        key: "".concat(options.id, "_supplyName"),
+        dataType: "string"
+      }, {
+        name: "jst供销商编码",
+        key: "".concat(options.id, "_supplyId"),
+        dataType: "string"
+      }];
+    }
+    if (type === "supplyName") {
+      return [{
+        name: "jst供销商名称",
+        key: "".concat(options.id, "_supplyName"),
+        dataType: "string"
+      }];
+    }
+    if (type === "supplyId") {
+      return [{
+        name: "jst供销商编码",
+        key: "".concat(options.id, "_supplyId"),
+        dataType: "string"
+      }];
+    }
+    return [];
+  });
   _defineProperty(this, "renderClient", function (record) {
     var isShow = Array.isArray(record === null || record === void 0 ? void 0 : record[_this.id]) ? some(record === null || record === void 0 ? void 0 : record[_this.id], function (item) {
       return !isNull(item);
@@ -119,21 +149,22 @@ var JstSupply = /*#__PURE__*/_createClass(function JstSupply(options) {
       }
     }];
   });
-  this.name = options.name;
-  this.id = options.id;
-  this.sortField = "".concat(options.id, "_jstItemList");
-  this.formField = "".concat(options.id, "_jstItemList");
-  this.type = options.type;
-  this.componentConfig = options.componentConfig;
+  this.name = _options.name;
+  this.id = _options.id;
+  this.sortField = "".concat(_options.id, "_jstItemList");
+  this.formField = "".concat(_options.id, "_jstItemList");
+  this.sortChildField = this.getSortChildFields(((_this$componentConfig3 = this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.showField) || "", _options);
+  this.type = _options.type;
+  this.componentConfig = _options.componentConfig;
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];
   this.dataType = "object";
-  this.rules = (_this$componentConfig3 = this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.required ? [{
+  this.rules = (_this$componentConfig4 = this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.required ? [{
     required: true,
     validator: function validator(_, value) {
-      var _this$componentConfig4;
-      var showField = (_this === null || _this === void 0 ? void 0 : (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.showField) || "";
+      var _this$componentConfig5;
+      var showField = (_this === null || _this === void 0 ? void 0 : (_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.showField) || "";
       if (!value || !value.length) {
         return Promise.reject(new Error("请选择宝贝"));
       }

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, SubForm, CommonDataTime, TradeId, ShopName, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, FlowTag, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, PrevSubmitter, FlowCreator, Handler, CompletedUser, LogisticsInterception, LogisticsMoreInterception, LogisticsTrajectory, LogisticsMoreTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration, WlnGoods, BsPosting, MsgStatus, NodeInput, FlowWorkOrderStatus, WdtGoods, WdtReturn, WdtExchange, CommonInput, PaymentVoucherCode, Label, WdtReissue, KmErpSendGood, AfterSalesOrderId } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => ActualPayment | BasicAddress | AfterSalesOrderId | AliPay | BsExchange | BsGoods | BsLogistics | BsPosting | BsReissue | BsReturn | BsSystemOrder | BuyerNick | Calculation | BasicCascader | BasicCheckbox | CommonInput | CommonMultiStatus | CommonSystemOrder | BasicDataTime | ItemEnCode | ItemId | ItemSelect | TradeId | BasicInput | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | ShopName | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ERemark | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | PaymentVoucherCode | Label | KmErpSendGood;
+export declare const factory: (type: string, options: PickOption) => BasicCascader | StatusSelect | TradeId | BasicInput | BasicAddress | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | CommonDataTime | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | BsSystemOrder | BsGoods | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | CommonInput | PaymentVoucherCode | Label | KmErpSendGood | AfterSalesOrderId;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "1.16.3-beta.0",
+  "version": "1.16.3-beta.2",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "1.16.3-beta.0",
-    "@kmkf-fe-packages/kmkf-utils": "1.16.3-beta.0",
+    "@kmkf-fe-packages/basic-components": "1.16.3-beta.1",
+    "@kmkf-fe-packages/kmkf-utils": "1.16.3-beta.1",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d3271bcda380dcb6fad5a58e850748386bb83c02",
+  "gitHead": "0062fc826b5ca4fc3ad1d5490991c5eab6c75168",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }