@kmkf-fe-packages/services-components 2.2.20 → 2.2.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/esm/Hooks/useColumnsConfig.d.ts +1 -1
  2. package/dist/esm/components/Public/Goods/index.js +7 -36
  3. package/dist/esm/components/Remark/index.d.ts +18 -2
  4. package/dist/esm/components/Remark/index.js +37 -2
  5. package/dist/esm/factory.d.ts +1 -1
  6. package/package.json +4 -4
package/dist/esm/Hooks/useColumnsConfig.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import LogisticsInterception from "../components/LogisticsInterception";
2
2
  import LogisticsMoreInterception from "../components/LogisticsMoreInterception";
3
- export declare const newRenderColumnItem: (effects: any) => (item: any) => import("../components/ActualPayment").default | import("../components/Address").default | import("../components/AfterSalesOrderId").default | import("../components/Alipay").default | import("../components/BS/BsExchange").default | import("../components/BS/BsGoods").default | import("../components/BS/BsLogistics").default | import("../components/BS/BsPosting").default | import("../components/BS/BsReissue").default | import("../components/BS/BsReturn").default | import("../components/BS/BsSystemOrder").default | import("../components/BsE3/BsGoods").default | import("../components/BsE3/BsReissueE3").default | import("../components/BuyerNick").default | import("../components/Calculation").default | import("../components/Cascader").default | import("../components/Checkbox").default | import("../components/CommonDataTime").default | import("../components/CommonInput").default | import("../components/CommonMultiStatus").default | import("../components/CommonSystemOrder").default | import("../components/CompletedUser").default | import("../components/DataTime").default | import("../components/EItemEnCode").default | import("../components/EItemId").default | import("../components/EItemSelect").default | import("../components/Input").default | import("../components/TypeInput").default | import("../components/Select").default | import("../components/SelectOption").default | import("../components/Radio").default | import("../components/TextArea").default | import("../components/Picture").default | import("../components/PicturePro").default | import("../components/MultSelect").default | import("../components/Grade").default | import("../components/Rate").default | import("../components/File").default | import("../components/PostIng").default | import("../components/SubForm").default | import("../components/TradeId").default | import("../components/ShopName").default | import("../components/ReceiverName").default | import("../components/ReceiverMobile").default | import("../components/ReceiverAddress").default | import("../components/TradeDateTime").default | import("../components/Logistics").default | import("../components/ReturnLogistics").default | import("../components/Remark").default | import("../components/SystemOrderNo").default | import("../components/Ordinary").default | import("../components/ThirdItemSelect").default | import("../components/Payment").default | import("../components/Reissue/Logistics").default | import("../components/JST/JstItemSelect").default | import("../components/JST/JstSendGood").default | import("../components/JST/JstSupply").default | import("../components/Public/Goods").default | import("../components/Public/ReissueGoods").default | import("../components/Public/Exchange").default | import("../components/FlowStatusSelect").default | import("../components/FlowMarkSelect").default | import("../components/FlowTag").default | import("../components/TemplateSelect").default | import("../components/WorkOrderId").default | LogisticsInterception | LogisticsMoreInterception | import("../components/LogisticsTrajectory").default | import("../components/LogisticsMoreTrajectory").default | import("../components/PlatForm").default | import("../components/ShopInput").default | import("../components/Submitter").default | import("../components/PrevSubmitter").default | import("../components/FlowCreator").default | import("../components/Handler").default | import("../components/FlowWorkOrderId").default | import("../components/StatusSelect").default | import("../components/NodeDeadLine").default | import("../components/HandlerDeadLine").default | import("../components/NodeStayDuration").default | import("../components/WLN/WlnGoods").default | import("../components/NodeInput").default | import("../components/FlowWorkOrderStatus").default | import("../components/MsgStatus").default | import("../components/WDT/WdtGoods").default | import("../components/WDT/WdtRessuie").default | import("../components/WDT/WdtReturn").default | import("../components/WDT/WdtExchange").default | import("../components/WDT/WdtShopSelect").default | import("../components/KM/KmVideo").default | import("../components/PaymentVoucherCode").default | import("../components/Label").default | import("../components/MemberLevel").default | import("../components/GY/GyGoods").default | import("../components/GY/GyReissue").default | import("../components/GY/GyReturn").default | import("../components/Public/AsyncSelect").default | import("../components/SKX/SkxIdInputSelect").default | import("../components/SKX/SkxGoods").default | import("../components/OrderSubForm").default;
3
+ export declare const newRenderColumnItem: (effects: any) => (item: any) => import("../components/ActualPayment").default | import("../components/Address").default | import("../components/AfterSalesOrderId").default | import("../components/Alipay").default | import("../components/BS/BsExchange").default | import("../components/BS/BsGoods").default | import("../components/BS/BsLogistics").default | import("../components/BS/BsPosting").default | import("../components/BS/BsReissue").default | import("../components/BS/BsReturn").default | import("../components/BS/BsSystemOrder").default | import("../components/BsE3/BsGoods").default | import("../components/BsE3/BsReissueE3").default | import("../components/BuyerNick").default | import("../components/Calculation").default | import("../components/Cascader").default | import("../components/Checkbox").default | import("../components/CommonDataTime").default | import("../components/CommonInput").default | import("../components/CommonMultiStatus").default | import("../components/CommonSystemOrder").default | import("../components/CompletedUser").default | import("../components/DataTime").default | import("../components/EItemEnCode").default | import("../components/EItemId").default | import("../components/EItemSelect").default | import("../components/Input").default | import("../components/TypeInput").default | import("../components/Select").default | import("../components/SelectOption").default | import("../components/Radio").default | import("../components/TextArea").default | import("../components/Picture").default | import("../components/PicturePro").default | import("../components/MultSelect").default | import("../components/Grade").default | import("../components/Rate").default | import("../components/File").default | import("../components/PostIng").default | import("../components/SubForm").default | import("../components/TradeId").default | import("../components/ShopName").default | import("../components/ReceiverName").default | import("../components/ReceiverMobile").default | import("../components/ReceiverAddress").default | import("../components/TradeDateTime").default | import("../components/Logistics").default | import("../components/ReturnLogistics").default | import("../components/Remark").default | import("../components/SystemOrderNo").default | import("../components/Ordinary").default | import("../components/ThirdItemSelect").default | import("../components/Payment").default | import("../components/Reissue/Logistics").default | import("../components/JST/JstItemSelect").default | import("../components/JST/JstSendGood").default | import("../components/JST/JstSupply").default | import("../components/Public/Goods").default | import("../components/Public/ReissueGoods").default | import("../components/Public/Exchange").default | import("../components/FlowStatusSelect").default | import("../components/FlowMarkSelect").default | import("../components/FlowTag").default | import("../components/TemplateSelect").default | import("../components/WorkOrderId").default | LogisticsInterception | LogisticsMoreInterception | import("../components/LogisticsTrajectory").default | import("../components/LogisticsMoreTrajectory").default | import("../components/PlatForm").default | import("../components/ShopInput").default | import("../components/Submitter").default | import("../components/PrevSubmitter").default | import("../components/FlowCreator").default | import("../components/Handler").default | import("../components/FlowWorkOrderId").default | import("../components/StatusSelect").default | import("../components/NodeDeadLine").default | import("../components/HandlerDeadLine").default | import("../components/NodeStayDuration").default | import("../components/WLN/WlnGoods").default | import("../components/NodeInput").default | import("../components/FlowWorkOrderStatus").default | import("../components/MsgStatus").default | import("../components/WDT/WdtGoods").default | import("../components/WDT/WdtRessuie").default | import("../components/WDT/WdtReturn").default | import("../components/WDT/WdtExchange").default | import("../components/WDT/WdtShopSelect").default | import("../components/KM/KmVideo").default | import("../components/PaymentVoucherCode").default | import("../components/Label").default | import("../components/MemberLevel").default | import("../components/GY/GyGoods").default | import("../components/GY/GyReissue").default | import("../components/GY/GyReturn").default | import("../components/Public/AsyncSelect").default | import("../components/SKX/SkxIdInputSelect").default | import("../components/SKX/SkxGoods").default | import("../components/OrderSubForm").default | import("../components/FlowOverallStatusSelect").default;
4
4
  export declare const useColumnsConfig: ({ queryWorkOrderDetail, flatTemplateList, shopList, sortState, onChangeSort, handleReset, handleSubmit, handleChangeSingleWorkOrderMark, userList, tbAppKey, isShare, openSingleColumnsFilter, openSingleColumnsSort, }: {
5
5
  queryWorkOrderDetail?: ((p: any) => void) | undefined;
6
6
  flatTemplateList?: any;
package/dist/esm/components/Public/Goods/index.js CHANGED
@@ -14,7 +14,7 @@ import { BsGoodsTable } from "../../Common";
14
14
  import CommonHeaderGoods from "../../CommonHeaderGood";
15
15
  import ItemView from "../../../commonComponents/ItemView";
16
16
  import { isNull } from "@kmkf-fe-packages/kmkf-utils";
17
- import { CommonGoods as Goods, erpFormValidator } from "@kmkf-fe-packages/basic-components";
17
+ import { CommonGoods as Goods } from "@kmkf-fe-packages/basic-components";
18
18
  import { SYMBOL } from "../../../constant";
19
19
  var CONFIG_MAP = {
20
20
  JST_GOODS: {
@@ -27,22 +27,13 @@ var CONFIG_MAP = {
27
27
  },
28
28
  JY_GOODS: {
29
29
  name: "巨益",
30
- key: "jyGoods",
31
- validator: function validator(_rule, value, type) {
32
- if (!_rule.required) return Promise.resolve();
33
- var validatorFlag = erpFormValidator(_rule, value, type);
34
- if (validatorFlag) {
35
- return validatorFlag;
36
- }
37
- return Promise.resolve();
38
- }
30
+ key: "jyGoods"
39
31
  }
40
32
  };
41
33
  var PublicGoods = /*#__PURE__*/_createClass(function PublicGoods(options) {
42
34
  var _this = this,
43
35
  _CONFIG_MAP$this$type,
44
- _this$componentConfig6,
45
- _CONFIG_MAP$this$type2;
36
+ _this$componentConfig6;
46
37
  _classCallCheck(this, PublicGoods);
47
38
  _defineProperty(this, "name", void 0);
48
39
  _defineProperty(this, "id", void 0);
@@ -135,37 +126,17 @@ var PublicGoods = /*#__PURE__*/_createClass(function PublicGoods(options) {
135
126
  }));
136
127
  this.children = [this.headers];
137
128
  this.componentConfig = options === null || options === void 0 ? void 0 : options.componentConfig;
138
- var isRequired = this === null || this === void 0 ? void 0 : (_this$componentConfig6 = this.componentConfig) === null || _this$componentConfig6 === void 0 ? void 0 : _this$componentConfig6.required;
139
- this.rules = [{
140
- required: isRequired,
129
+ this.rules = this !== null && this !== void 0 && (_this$componentConfig6 = this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.required ? [{
130
+ required: true,
141
131
  validator: function validator(_, value) {
142
132
  var _value$key;
143
- if (isRequired && (!value || !(value !== null && value !== void 0 && (_value$key = value[key]) !== null && _value$key !== void 0 && _value$key.length))) {
133
+ if (!value || !(value !== null && value !== void 0 && (_value$key = value[key]) !== null && _value$key !== void 0 && _value$key.length)) {
144
134
  var _CONFIG_MAP$_this$typ6;
145
135
  return Promise.reject(new Error("\u8BF7\u9009\u62E9".concat((_CONFIG_MAP$_this$typ6 = CONFIG_MAP[_this.type]) === null || _CONFIG_MAP$_this$typ6 === void 0 ? void 0 : _CONFIG_MAP$_this$typ6.name, "\u5546\u54C1")));
146
136
  }
147
137
  return Promise.resolve();
148
138
  }
149
- }
150
- // {
151
- // required: isRequired,
152
- // validator: (_rule: any, value: any) =>
153
- // CONFIG_MAP[this.type]?.validator?.(_rule, value, this.type) ||
154
- // (() => Promise.resolve()),
155
- // },
156
- ];
157
-
158
- if ((_CONFIG_MAP$this$type2 = CONFIG_MAP[this.type]) !== null && _CONFIG_MAP$this$type2 !== void 0 && _CONFIG_MAP$this$type2.validator) {
159
- this.rules.push({
160
- required: isRequired,
161
- validator: function validator(_rule, value) {
162
- var _CONFIG_MAP$_this$typ7, _CONFIG_MAP$_this$typ8;
163
- return ((_CONFIG_MAP$_this$typ7 = CONFIG_MAP[_this.type]) === null || _CONFIG_MAP$_this$typ7 === void 0 ? void 0 : (_CONFIG_MAP$_this$typ8 = _CONFIG_MAP$_this$typ7.validator) === null || _CONFIG_MAP$_this$typ8 === void 0 ? void 0 : _CONFIG_MAP$_this$typ8.call(_CONFIG_MAP$_this$typ7, _rule, value, _this.type)) || function () {
164
- return Promise.resolve();
165
- };
166
- }
167
- });
168
- }
139
+ }] : [];
169
140
  this.dataType = "object";
170
141
  });
171
142
  export default PublicGoods;
package/dist/esm/components/Remark/index.d.ts CHANGED
@@ -29,7 +29,7 @@ declare class ERemark implements ComponentInterface {
29
29
  };
30
30
  renderExport: (value: unknown, record: Record) => any;
31
31
  editRender: (p: any) => React.JSX.Element;
32
- filterConfig: (item: ColumnConfig) => {
32
+ filterConfig: (item: ColumnConfig) => ({
33
33
  searchDefaultConditions: {
34
34
  in: "in";
35
35
  anylike: "anylike";
@@ -43,9 +43,25 @@ declare class ERemark implements ComponentInterface {
43
43
  label: string;
44
44
  value: string;
45
45
  }[];
46
+ options?: undefined;
46
47
  };
47
48
  filterFn: (value: string) => (i: Record) => boolean;
48
49
  formatFilterValue: (value: any) => any;
49
- };
50
+ } | {
51
+ searchDefaultConditions: "in";
52
+ type: string;
53
+ id: string;
54
+ name: string;
55
+ filterComponentType: "MultipleSelect";
56
+ props: {
57
+ options: {
58
+ label: string;
59
+ value: string;
60
+ }[];
61
+ filterOptions?: undefined;
62
+ };
63
+ filterFn: (value: string[]) => (i: Record) => boolean;
64
+ formatFilterValue?: undefined;
65
+ })[];
50
66
  }
51
67
  export default ERemark;
package/dist/esm/components/Remark/index.js CHANGED
@@ -98,7 +98,7 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
98
98
  });
99
99
  });
100
100
  _defineProperty(this, "filterConfig", function (item) {
101
- return {
101
+ return [{
102
102
  searchDefaultConditions: {
103
103
  in: SYMBOL.in,
104
104
  anylike: SYMBOL.anylike
@@ -124,7 +124,42 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
124
124
  return value;
125
125
  }
126
126
  }
127
- };
127
+ }, {
128
+ searchDefaultConditions: SYMBOL.in,
129
+ type: item.type,
130
+ id: "".concat(item.id, "_flag"),
131
+ // 过滤组件id
132
+ name: "".concat(item.name, "\u65D7\u5E1C"),
133
+ // 过滤组件名称
134
+ filterComponentType: 'MultipleSelect',
135
+ props: {
136
+ //不使用workOrderMark的数据，筛选会深拷贝
137
+ options: [{
138
+ label: '灰色',
139
+ value: '0'
140
+ }, {
141
+ label: '红色',
142
+ value: '1'
143
+ }, {
144
+ label: '黄色',
145
+ value: '2'
146
+ }, {
147
+ label: '绿色',
148
+ value: '3'
149
+ }, {
150
+ label: '蓝色',
151
+ value: '4'
152
+ }, {
153
+ label: '紫色',
154
+ value: '5'
155
+ }]
156
+ },
157
+ filterFn: function filterFn(value) {
158
+ return function (i) {
159
+ return value === null || value === void 0 ? void 0 : value.includes(_filterFn.filterTableListItemColumnValue(i, item.id, ''));
160
+ };
161
+ }
162
+ }];
128
163
  });
129
164
  this.name = options.name;
130
165
  this.id = options.id;
package/dist/esm/factory.d.ts CHANGED
@@ -1,3 +1,3 @@
1
1
  import { ReissueLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicPicturePro, 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, GyReissue, AfterSalesOrderId, BsE3Goods, PublicGoods, PublicReissueGoods, PublicExchange, GyGoods, BsE3Reissue, MemberLevel, GyReturn, AsyncSelect, WdtShopSelect, KmVideo, BasicTypeInput, SkxIdInputSelect, SkxGoods, BasicSelectOption, OrderSubForm } from "./index";
2
2
  import { PickOption } from "./type";
3
- export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | 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 | Payment | ReissueLogistics | JstItemSelect | JstSendGood | JstSupply | BsGoods | BsE3Goods | PublicGoods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | MsgStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm | GyGoods;
3
+ export declare const factory: (type: string, options: PickOption) => BsLogistics | BsSystemOrder | CommonDataTime | JstSendGood | MsgStatus | PublicGoods | ERemark | BasicInput | BasicTypeInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicSelectOption | BasicRadio | BasicTextArea | BasicPicture | BasicPicturePro | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | SubForm | TradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | ReissueLogistics | JstItemSelect | JstSupply | BsGoods | BsE3Goods | PublicReissueGoods | PublicExchange | BsE3Reissue | BsExchange | BsReissue | BsReturn | FlowStatusSelect | FlowMarkSelect | FlowTag | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsMoreInterception | LogisticsTrajectory | LogisticsMoreTrajectory | PlatForm | ShopInput | Submitter | PrevSubmitter | FlowCreator | Handler | CompletedUser | FlowWorkOrderId | StatusSelect | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration | WlnGoods | BsPosting | NodeInput | FlowWorkOrderStatus | WdtGoods | WdtReissue | WdtReturn | WdtExchange | WdtShopSelect | KmVideo | CommonInput | PaymentVoucherCode | Label | MemberLevel | AfterSalesOrderId | GyGoods | GyReissue | GyReturn | AsyncSelect | SkxIdInputSelect | SkxGoods | OrderSubForm;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kmkf-fe-packages/services-components",
3
- "version": "2.2.20",
3
+ "version": "2.2.21",
4
4
  "module": "dist/esm/index.js",
5
5
  "typings": "dist/esm/index.d.ts",
6
6
  "files": [
@@ -21,8 +21,8 @@
21
21
  ]
22
22
  },
23
23
  "dependencies": {
24
- "@kmkf-fe-packages/basic-components": "2.2.20",
25
- "@kmkf-fe-packages/kmkf-utils": "2.2.20",
24
+ "@kmkf-fe-packages/basic-components": "2.2.21",
25
+ "@kmkf-fe-packages/kmkf-utils": "2.2.21",
26
26
  "b64-to-blob": "^1.2.19",
27
27
  "html2canvas": "^1.4.1",
28
28
  "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
41
41
  "publishConfig": {
42
42
  "access": "public"
43
43
  },
44
- "gitHead": "251c7eb415db5fee9404462720250c11329a2b6a",
44
+ "gitHead": "1426042144c662d01ea92d1004e75b4b878668e9",
45
45
  "gitHooks": {
46
46
  "pre-commit": "lint-staged"
47
47
  }