@kmkf-fe-packages/services-components 0.7.8 → 0.7.9

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

@@ -11,11 +11,13 @@ import { TradeId } from '@kmkf-fe-packages/basic-components';
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
 import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { SYMBOL } from "../../constant";
 var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
   var _this = this;
   _classCallCheck(this, ETradeId);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
+  _defineProperty(this, "sortField", void 0);
   _defineProperty(this, "type", void 0);
   _defineProperty(this, "rules", void 0);
   _defineProperty(this, "canFilter", void 0);
@@ -27,6 +29,7 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
   _defineProperty(this, "componentConfig", void 0);
   _defineProperty(this, "effects", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
@@ -71,8 +74,9 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
   });
   _defineProperty(this, "filterConfig", function (item) {
     return {
+      searchDefaultConditions: SYMBOL.in,
       type: item.type,
-      id: item.id,
+      id: "".concat(item.id, "_tradeId"),
       // 过滤组件id
       name: item.name,
       // 过滤组件名称
@@ -81,11 +85,15 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
         return function (i) {
           return _filterFn.filterSplitComma(_filterFn.filterTableListItemColumnValue(i, item.id, 'tradeId'), value);
         };
+      },
+      formatFilterValue: function formatFilterValue(input) {
+        return input.split(/[,|，]/);
       }
     };
   });
   this.name = options.name;
   this.id = options.id;
+  this.sortField = "".concat(options.id, "_tradeId");
   this.type = options.type;
   this.canFilter = true;
   this.canGroup = true;
@@ -97,6 +105,7 @@ var ETradeId = /*#__PURE__*/_createClass(function ETradeId(options) {
   this.effects = options.effects;
   this.rules = [];
   this.isCombinationComponent = false;
+  this.canSort = true;
   this.children = [];
 });
 export default ETradeId;

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

@@ -3,11 +3,13 @@ import React from 'react';
 declare class WorkOrderId implements ComponentInterface {
     name: string;
     id: string;
+    sortField: string;
     type: string;
     rules: any[];
     componentConfig: ComponentInterface["componentConfig"];
     effects: ComponentInterface["effects"];
     isCombinationComponent: boolean;
+    canSort: boolean;
     children: ComponentInterface[];
     constructor(options: PickOption);
     copyHandle: (text: string) => void;
@@ -18,6 +20,7 @@ declare class WorkOrderId implements ComponentInterface {
     renderClient: () => null;
     editRender: () => React.JSX.Element;
     filterConfig: (item: ColumnConfig) => {
+        searchDefaultConditions: "like";
         type: string;
         id: string;
         name: string;

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

@@ -14,35 +14,44 @@ import { filterFn as _filterFn, isNull } from '@kmkf-fe-packages/kmkf-utils';
 import GetFormItem from "../GetFormItem";
 import repeatPng from "./img/repeat.png";
 import copy from 'copy-to-clipboard';
+import { SYMBOL } from "../../constant";
 var WorkOrderId = /*#__PURE__*/_createClass(function WorkOrderId(options) {
   var _this = this;
   _classCallCheck(this, WorkOrderId);
   _defineProperty(this, "name", void 0);
   _defineProperty(this, "id", void 0);
+  _defineProperty(this, "sortField", void 0);
   _defineProperty(this, "type", void 0);
   _defineProperty(this, "rules", void 0);
   _defineProperty(this, "componentConfig", void 0);
   _defineProperty(this, "effects", void 0);
   _defineProperty(this, "isCombinationComponent", void 0);
+  _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "copyHandle", function (text) {
     copy(text);
     message.success('复制成功');
   });
   _defineProperty(this, "renderPc", function (value, record) {
-    var _record$repeatConfig;
+    var _record$repeatValueLi;
     if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) === undefined) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, "--");
     }
-    return /*#__PURE__*/React.createElement("span", null, (record === null || record === void 0 ? void 0 : (_record$repeatConfig = record.repeatConfig) === null || _record$repeatConfig === void 0 ? void 0 : _record$repeatConfig.show) && /*#__PURE__*/React.createElement("img", {
+    return /*#__PURE__*/React.createElement("span", null, (record === null || record === void 0 ? void 0 : (_record$repeatValueLi = record.repeatValueList) === null || _record$repeatValueLi === void 0 ? void 0 : _record$repeatValueLi.length) > 0 && /*#__PURE__*/React.createElement("img", {
       src: repeatPng,
       style: {
         width: '16px'
       },
       alt: "",
       onClick: function onClick() {
-        var _this$effects, _this$effects2;
+        var _this$effects, _this$effects2, _this$effects3, _this$effects4;
+        // TODO: 前端筛选时的重复提醒版本，等分享页面整改之后，这个将会废弃
         typeof (_this === null || _this === void 0 ? void 0 : (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.handleOpenRepeatList) === 'function' && (_this === null || _this === void 0 ? void 0 : (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.handleOpenRepeatList(record === null || record === void 0 ? void 0 : record.repeatConfig));
+        typeof (_this === null || _this === void 0 ? void 0 : (_this$effects3 = _this.effects) === null || _this$effects3 === void 0 ? void 0 : _this$effects3.handleOpenRepeatDetail) === 'function' && (_this === null || _this === void 0 ? void 0 : (_this$effects4 = _this.effects) === null || _this$effects4 === void 0 ? void 0 : _this$effects4.handleOpenRepeatDetail({
+          templateId: record === null || record === void 0 ? void 0 : record.templateId,
+          workOrderUniqueKey: record === null || record === void 0 ? void 0 : record.id,
+          fieldList: record === null || record === void 0 ? void 0 : record.repeatValueList
+        }));
       }
     }), /*#__PURE__*/React.createElement(React.Fragment, null, record === null || record === void 0 ? void 0 : record["".concat(_this.id)], /*#__PURE__*/React.createElement("span", {
       onClick: function onClick() {
@@ -83,6 +92,7 @@ var WorkOrderId = /*#__PURE__*/_createClass(function WorkOrderId(options) {
   });
   _defineProperty(this, "filterConfig", function (item) {
     return {
+      searchDefaultConditions: SYMBOL.like,
       type: item.type,
       id: item.id,
       // 过滤组件id
@@ -98,11 +108,13 @@ var WorkOrderId = /*#__PURE__*/_createClass(function WorkOrderId(options) {
   });
   this.name = options.name;
   this.id = options.id;
+  this.sortField = options.id;
   this.type = options.type;
   this.componentConfig = options.componentConfig;
   this.effects = options.effects;
   this.rules = [];
   this.isCombinationComponent = false;
+  this.canSort = true;
   this.children = [];
 });
 export default WorkOrderId;

package/dist/esm/constant.d.ts

@@ -0,0 +1,14 @@
+export declare const SYMBOL: {
+    between: string;
+    eq: string;
+    like: string;
+    gt: string;
+    gte: string;
+    lt: string;
+    lte: string;
+    ne: string;
+    in: string;
+    nin: string;
+    non: string;
+    notnull: string;
+};

package/dist/esm/constant.js

@@ -0,0 +1,14 @@
+export var SYMBOL = {
+  between: 'between',
+  eq: 'eq',
+  like: 'like',
+  gt: 'gt',
+  gte: 'gte',
+  lt: 'lt',
+  lte: 'lte',
+  ne: 'ne',
+  in: 'in',
+  nin: 'nin',
+  non: 'non',
+  notnull: 'notnull'
+};

package/dist/esm/type.d.ts

@@ -1,25 +1,32 @@
 /// <reference types="react" />
 import type { FormInstance } from "antd";
+import { SYMBOL } from './constant';
 export declare type DataType = "string" | "number" | "array" | "dateArray" | "date" | "tradeId";
 export declare type ALignType = "left" | "right" | "center";
+export declare type QuerySymbol = keyof typeof SYMBOL;
 export declare type Record = {
     [props in string]: any;
 };
 export declare type FilterConfigType = {
+    searchDefaultConditions: QuerySymbol;
     type: string;
     id: string;
     name: string;
-    options?: any[];
     filterComponentType: FilterComponentType;
+    props?: Record;
+    rules?: Array<any>;
     filterFn?: (p: any) => (r: Record) => unknown;
+    formatFilterValue?: (p: any) => any;
 };
-export declare type FilterComponentType = "MultipleSelect" | "Input" | "Date" | "Cascader" | "ShopList";
+export declare type FilterComponentType = "MultipleSelect" | "Input" | "Date" | "Cascader" | "ShopList" | "Rate";
 export interface ComponentInterface {
     id: string;
+    sortField: string;
     name: string;
     columnHeader?: string | JSX.Element;
     type: string;
     isCombinationComponent: boolean;
+    canSort: boolean;
     children: ComponentInterface[];
     rules?: any[];
     width?: number;
@@ -122,6 +129,7 @@ export interface ComponentInterface {
     effects?: {
         queryWorkOrderDetail?: (r: Record) => void;
         handleOpenRepeatList?: (r: Record) => void;
+        handleOpenRepeatDetail?: (r: Record) => void;
         handleChangeSingleWorkOrderStatus?: (t: string, r: Record) => void;
         templateList?: any[];
         isEditing?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.7.8",
+  "version": "0.7.9",
   "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.8",
-    "@kmkf-fe-packages/kmkf-utils": "^0.7.8"
+    "@kmkf-fe-packages/basic-components": "^0.7.9",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.9"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "630cb0b0ae60a5af792b2cc766111838bb2deebf"
+  "gitHead": "d75ce8729a2c90929b0b21c87e5f60badec5b997"
 }