@kmkf-fe-packages/services-components 0.7.15-alpha.76 → 0.7.15-alpha.78

package/dist/esm/components/BS/BsGoods/index.d.ts

@@ -1,19 +1,19 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../../type';
-import React from 'react';
-import { BsHeaderGood } from '../common/index';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../../type";
+import React from "react";
+import { BsHeaderGood } from "../common/index";
 declare class BsGoods implements ComponentInterface {
     name: string;
     id: string;
     sortField: string;
     type: string;
     rules: any[];
-    componentConfig: ComponentInterface['componentConfig'];
-    effects: ComponentInterface['effects'];
+    componentConfig: ComponentInterface["componentConfig"];
+    effects: ComponentInterface["effects"];
     isCombinationComponent: boolean;
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface['dataType'];
+    dataType: ComponentInterface["dataType"];
     bsGoods: BsHeaderGood;
     constructor(options: PickOption);
     renderClient: (record: any) => React.JSX.Element | null;

package/dist/esm/components/BS/BsGoods/index.js

@@ -8,54 +8,54 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 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 React from "react";
 import GetFormItem from "../../GetFormItem";
 import { BsGoodsTable } from "../../Common";
 import { BsHeaderPic, BsHeaderName, BsHeaderCode, BsHeaderSku, BsHeaderMoney, BsHeaderNumber, BsHeaderShare, BsHeaderType, BsHeaderGood } from "../common/index";
 import ItemView from "../../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
-import { BsGoods as Goods } from '@kmkf-fe-packages/basic-components';
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
+import { BsGoods as Goods } from "@kmkf-fe-packages/basic-components";
 import { SYMBOL } from "../../../constant";
 var childHeaderMap = {
   pic: {
     component: BsHeaderPic,
-    name: '图片',
-    key: 'pic'
+    name: "图片",
+    key: "pic"
   },
   name: {
     component: BsHeaderName,
-    name: '名称',
-    key: 'name'
+    name: "名称",
+    key: "name"
   },
   code: {
     component: BsHeaderCode,
-    name: '编码',
-    key: 'code'
+    name: "编码",
+    key: "code"
   },
   sku: {
     component: BsHeaderSku,
-    name: 'sku编码',
-    key: 'sku'
+    name: "sku编码",
+    key: "sku"
   },
   money: {
     component: BsHeaderMoney,
-    name: '实付金额',
-    key: 'money'
+    name: "实付金额",
+    key: "money"
   },
   number: {
     component: BsHeaderNumber,
-    name: '数量',
-    key: 'number'
+    name: "数量",
+    key: "number"
   },
   share: {
     component: BsHeaderShare,
-    name: '分摊价',
-    key: 'share'
+    name: "分摊价",
+    key: "share"
   },
   type: {
     component: BsHeaderType,
-    name: '赠品类型',
-    key: 'giftType'
+    name: "赠品类型",
+    key: "giftType"
   }
 };
 var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
@@ -122,7 +122,7 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
       // 过滤组件id
       name: item.name,
       // 过滤组件名称
-      filterComponentType: 'Input'
+      filterComponentType: "Input"
     }];
   });
   this.name = options.name;
@@ -135,7 +135,7 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
   this.canSort = false;
   this.bsGoods = new BsHeaderGood(_objectSpread(_objectSpread({}, options), {}, {
     id: "".concat(options.id, "_bsGoods"),
-    name: '商品信息'
+    name: "商品信息"
   }));
   this.children = [this.bsGoods];
   // this.children = (options?.componentConfig?.showHeader || []).reduce(
@@ -159,11 +159,11 @@ var BsGoods = /*#__PURE__*/_createClass(function BsGoods(options) {
     validator: function validator(_, value) {
       var _value$bsGoods;
       if (!value || !(value !== null && value !== void 0 && (_value$bsGoods = value.bsGoods) !== null && _value$bsGoods !== void 0 && _value$bsGoods.length)) {
-        return Promise.reject(new Error('请选择bs商品'));
+        return Promise.reject(new Error("请选择bs商品"));
       }
       return Promise.resolve();
     }
   }] : [];
-  this.dataType = 'object';
+  this.dataType = "object";
 });
 export default BsGoods;

package/dist/esm/components/BS/common/BsHeaderGood.js

@@ -73,7 +73,7 @@ var HeaderMap = {
   type: {
     component: BsHeaderChild,
     name: "赠品类型",
-    key: "giftType",
+    key: "type",
     width: 150
   }
 };

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

@@ -297,6 +297,12 @@ export var BsGoodsTable = function BsGoodsTable(_ref9) {
   var GOODS_INFO_COLUMNS = function GOODS_INFO_COLUMNS() {
     var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
     return [{
+      dataIndex: "mark",
+      title: "\u5546\u54C1\u6807\u8BB0",
+      align: "center",
+      ellipsis: true,
+      width: 100
+    }, {
       dataIndex: "pic",
       title: "\u56FE\u7247",
       align: "center",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.7.15-alpha.76",
+  "version": "0.7.15-alpha.78",
   "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.76",
-    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.76"
+    "@kmkf-fe-packages/basic-components": "^0.7.15-alpha.78",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.15-alpha.78"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "59a50bea3ca62d5010ccb7a81ae5a95d8d724fcc"
+  "gitHead": "6b9df5c3d3f86da3f0dca5564281db9bb9ebda7e"
 }