@kmkf-fe-packages/services-components 1.16.5-alpha.0 → 1.16.5-alpha.6

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

@@ -21,6 +21,7 @@ import BsHeaderChild from "../BS/common/BsHeaderChild";
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
 import { isNull } from "@kmkf-fe-packages/kmkf-utils";
+import { difference } from 'lodash';
 import { SYMBOL } from "../../constant";
 var SubForm = /*#__PURE__*/_createClass(function SubForm(options) {
   var _this = this;
@@ -160,9 +161,22 @@ var SubForm = /*#__PURE__*/_createClass(function SubForm(options) {
         }
         return prv;
       }, {});
-      var msg = (value || []).reduce(function (prv, next) {
+      // TODO: 补充确省字段
+      var fillKeysValue = value === null || value === void 0 ? void 0 : value.map(function (item) {
+        var _this$componentConfig11, _this$componentConfig12;
+        var lostKeys = difference((_this$componentConfig11 = _this.componentConfig) === null || _this$componentConfig11 === void 0 ? void 0 : (_this$componentConfig12 = _this$componentConfig11.tableHeader) === null || _this$componentConfig12 === void 0 ? void 0 : _this$componentConfig12.map(function (item) {
+          return item.key;
+        }), Object.keys(item));
+        if (!isNull(lostKeys)) {
+          return lostKeys.reduce(function (prv, next) {
+            return _objectSpread(_objectSpread({}, prv), {}, _defineProperty({}, next, undefined));
+          }, item);
+        }
+        return item;
+      });
+      var msg = (fillKeysValue || []).reduce(function (prv, next) {
         Object.keys(next).forEach(function (key) {
-          if (result[key] && !next[key]) {
+          if (result[key] && isNull(next[key])) {
             prv = result[key];
           }
         });

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

@@ -13,7 +13,14 @@ declare class ThirdItemSelect implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     dataType: ComponentInterface['dataType'];
+    sortChildField: {
+        name: string;
+        key: string;
+        dataType: string;
+        [key: string]: any;
+    }[];
     constructor(options: PickOption);
+    getSortChildFields: () => 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/ThirdItemSelect/index.js

@@ -15,7 +15,7 @@ import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 import { SYMBOL } from "../../constant";
 var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(options) {
   var _this = this,
-    _this$componentConfig4;
+    _this$componentConfig6;
   _classCallCheck(this, ThirdItemSelect);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
@@ -29,6 +29,21 @@ var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(options
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "sortChildField", void 0);
+  _defineProperty(this, "getSortChildFields", function () {
+    var _this$componentConfig, _this$componentConfig2;
+    return [{
+      name: '供应商编码',
+      key: "".concat(_this.id, "_itemId"),
+      dataType: "arrayObject",
+      disabled: !((_this$componentConfig = _this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.enableItemId)
+    }, {
+      name: '供应商名称',
+      key: "".concat(_this.id, "_supplierName"),
+      dataType: "arrayObject",
+      disabled: !((_this$componentConfig2 = _this.componentConfig) !== null && _this$componentConfig2 !== void 0 && _this$componentConfig2.enableSupplierName)
+    }];
+  });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
@@ -68,7 +83,7 @@ var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(options
     });
   });
   _defineProperty(this, "editRender", function (p) {
-    var _this$componentConfig, _this$componentConfig2, _this$componentConfig3, _this$effects, _this$effects2;
+    var _this$componentConfig3, _this$componentConfig4, _this$componentConfig5, _this$effects, _this$effects2;
     return /*#__PURE__*/React.createElement(GetFormItem, {
       title: _this.name,
       name: _this.id,
@@ -76,9 +91,9 @@ var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(options
       required: false,
       hidden: p === null || p === void 0 ? void 0 : p.hidden,
       display: p === null || p === void 0 ? void 0 : p.display,
-      tooltip: (_this$componentConfig = _this.componentConfig) !== null && _this$componentConfig !== void 0 && _this$componentConfig.showTooltip ? (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.tooltip : '',
+      tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : '',
       component: /*#__PURE__*/React.createElement(ItemEncode, _extends({}, _this.componentConfig, {
-        maxLength: ((_this$componentConfig3 = _this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.maxLength) || 20,
+        maxLength: ((_this$componentConfig5 = _this.componentConfig) === null || _this$componentConfig5 === void 0 ? void 0 : _this$componentConfig5.maxLength) || 20,
         type: 4,
         shopId: (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId,
         shopList: ((_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.shopList) || [],
@@ -118,28 +133,29 @@ var ThirdItemSelect = /*#__PURE__*/_createClass(function ThirdItemSelect(options
   this.isCombinationComponent = false;
   this.canSort = false;
   this.children = [];
-  this.dataType = 'object';
-  this.rules = (_this$componentConfig4 = this.componentConfig) !== null && _this$componentConfig4 !== void 0 && _this$componentConfig4.required ? [{
+  this.dataType = 'array';
+  this.rules = (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required ? [{
     required: true,
     validator: function validator(_, value) {
-      var _this$componentConfig5, _this$componentConfig6;
+      var _this$componentConfig7, _this$componentConfig8;
       if (!value || !value.length) {
         return Promise.reject(new Error('请选择宝贝'));
       }
       var hasNotId = (value || []).some(function (item) {
         return !item.itemId && !item.supplierItemOuterId;
       });
-      if ((_this$componentConfig5 = _this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.enableItemId && hasNotId) {
+      if ((_this$componentConfig7 = _this.componentConfig) !== null && _this$componentConfig7 !== void 0 && _this$componentConfig7.enableItemId && hasNotId) {
         return Promise.reject(new Error('请输入供应商编码'));
       }
       var hasNotName = (value || []).some(function (item) {
         return !item.supplierName;
       });
-      if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.enableSupplierName && hasNotName) {
+      if ((_this$componentConfig8 = _this.componentConfig) !== null && _this$componentConfig8 !== void 0 && _this$componentConfig8.enableSupplierName && hasNotName) {
         return Promise.reject(new Error('请输入供应商名称'));
       }
       return Promise.resolve();
     }
   }] : [];
+  this.sortChildField = this.getSortChildFields();
 });
 export default ThirdItemSelect;

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

package/dist/esm/type.d.ts

@@ -47,8 +47,8 @@ export interface ComponentInterface {
     rules?: any[];
     width?: number;
     align?: ALignType;
-    dataType: "string" | "number" | "boolean" | "array" | "range" | "object";
-    format?: "dateTime" | "date" | "time" | "cascader" | "shopInput" | "staffGroup";
+    dataType: "string" | "number" | "boolean" | "array" | "range" | "object" | "arrayObject";
+    format?: "dateTime" | "date" | "time" | "cascader" | "shopInput" | "staffGroup" | "object";
     options?: Array<any>;
     templateId?: string;
     flowTemplateKey?: string;

package/package.json

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