@kmkf-fe-packages/services-components 0.7.14-alpha.0 → 0.7.14-alpha.13

package/dist/esm/commonComponents/OperationLog/index.js

@@ -18,6 +18,8 @@ var OperationLog = function OperationLog(_ref) {
     componentDtoList = _ref.componentDtoList;
   if (!content) return null;
   try {
+    //todo过滤一些固定字段 展示不确定
+    var filterList = ["COMPLETED_DATETIME", "COMPLETED_USER_INPUT"];
     if (/^TRANSFER/.test(operation)) {
       if (/^\[.*?\]-->>\[.*?\]$/.test(content)) {
         var _content$split = content.split("-->>"),
@@ -71,7 +73,7 @@ var OperationLog = function OperationLog(_ref) {
         }, {});
         var currentNeedContentId = Object.keys(currentContent);
         var newTemplateColumns = componentDtoList === null || componentDtoList === void 0 ? void 0 : componentDtoList.filter(function (item) {
-          return currentNeedContentId.findIndex(function (id) {
+          return !filterList.includes(item.workOrderComponentType) && currentNeedContentId.findIndex(function (id) {
             return id === null || id === void 0 ? void 0 : id.startsWith(item === null || item === void 0 ? void 0 : item.uniqueKey);
           }) > -1;
         });

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

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 declare type getFormItemProps = {
     name: string;
     title: string;
@@ -6,13 +6,13 @@ declare type getFormItemProps = {
     required: boolean;
     component: JSX.Element | string | null;
 };
-export declare const getFormItem: ({ name, title, rules, required, component }: getFormItemProps) => React.JSX.Element;
+export declare const getFormItem: ({ name, title, rules, required, component }: getFormItemProps) => JSX.Element;
 export declare const showImage: ({ item, type, index }: {
     item: any;
     type: string;
     index: number;
-}) => React.JSX.Element;
-export declare const ShowTotalImage: ({ total, allImage, type }: any) => React.JSX.Element;
-export declare const GoodImage: ({ list, type }: any) => React.JSX.Element | null;
+}) => JSX.Element;
+export declare const ShowTotalImage: ({ total, allImage, type }: any) => JSX.Element;
+export declare const GoodImage: ({ list, type }: any) => JSX.Element | null;
 export declare const JstGoodImage: ({ list, type }: any) => any;
 export {};

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

@@ -1,5 +1,5 @@
-import { ComponentInterface, PickOption, ColumnConfig, Record } from '../../type';
-import React from 'react';
+import { ComponentInterface, PickOption, ColumnConfig, Record } from "../../type";
+import React from "react";
 /**
  * 针对完成时间、创建时间、修改时间定义了3中类型
  */
@@ -14,8 +14,8 @@ declare class CommonDataTime implements ComponentInterface {
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
-    dataType: ComponentInterface['dataType'];
-    format: ComponentInterface['format'];
+    dataType: ComponentInterface["dataType"];
+    format: ComponentInterface["format"];
     constructor(options: PickOption);
     getValue: (value: string) => string;
     renderClient: (record: any) => React.JSX.Element | null;

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

@@ -5,10 +5,10 @@ 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 moment from 'moment';
+import React from "react";
+import moment from "moment";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
 import { SYMBOL } from "../../constant";
 
 /**
@@ -30,18 +30,18 @@ var CommonDataTime = /*#__PURE__*/_createClass(function CommonDataTime(options)
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "format", void 0);
   _defineProperty(this, "getValue", function (value) {
-    return moment(value).format('YYYY-MM-DD HH:mm:ss');
+    return moment(value).format("YYYY-MM-DD HH:mm:ss");
   });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: _this.getValue(record === null || record === void 0 ? void 0 : record[_this.id]) || ''
+      value: _this.getValue(record === null || record === void 0 ? void 0 : record[_this.id]) || ""
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
     var _record;
-    return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : '--';
+    return (_record = record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) !== null && _record !== void 0 ? _record : "--";
     // if (record?.[`${this.id}`] === undefined) {
     //   return <span>--</span>;
     // }
@@ -60,9 +60,9 @@ var CommonDataTime = /*#__PURE__*/_createClass(function CommonDataTime(options)
   });
   _defineProperty(this, "renderExport", function (value, record) {
     if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) === undefined) {
-      return '--';
+      return "--";
     }
-    return moment(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]).format('YYYY-MM-DD HH:mm:ss');
+    return moment(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]).format("YYYY-MM-DD HH:mm:ss");
   });
   _defineProperty(this, "editRender", function () {
     return null;
@@ -75,17 +75,17 @@ var CommonDataTime = /*#__PURE__*/_createClass(function CommonDataTime(options)
       // 过滤组件id
       name: item.name,
       // 过滤组件名称
-      filterComponentType: 'Date',
+      filterComponentType: "Date",
       filterFn: function filterFn(value) {
         return function (i) {
-          var recordDateTime = _filterFn.filterTableListItemColumnValue(i, item.id, '');
+          var recordDateTime = _filterFn.filterTableListItemColumnValue(i, item.id, "");
           return _filterFn.filterDateFn(value, recordDateTime);
         };
       },
       formatFilterValue: function formatFilterValue(val) {
         if ((val === null || val === void 0 ? void 0 : val.length) > 0) {
           return val === null || val === void 0 ? void 0 : val.map(function (v) {
-            return moment(v).startOf('second').valueOf();
+            return moment(v).startOf("second").valueOf();
           });
         }
       }
@@ -101,7 +101,7 @@ var CommonDataTime = /*#__PURE__*/_createClass(function CommonDataTime(options)
   this.isCombinationComponent = false;
   this.canSort = true;
   this.children = [];
-  this.dataType = 'string';
-  this.format = 'dateTime';
+  this.dataType = "string";
+  this.format = "dateTime";
 });
 export default CommonDataTime;

package/dist/esm/components/DataTime/ApaasDate.d.ts

@@ -1,9 +1,9 @@
-import React from 'react';
+/// <reference types="react" />
 declare const DateType: ['DATE', 'DATE_TIME', 'DATE_RANGE', 'DATE_TIME_RANGE'];
 export declare type ButtonType = typeof DateType[number];
 export interface ApaasDate {
     dateType?: ButtonType;
     [propName: string]: any;
 }
-declare const Date: (props: ApaasDate) => React.JSX.Element;
+declare const Date: (props: ApaasDate) => JSX.Element;
 export default Date;

package/dist/esm/components/EItemEnCode/ItemEncode.d.ts

@@ -1,3 +1,3 @@
-import React from 'react';
-declare const ItemEncode: (props: JSX.IntrinsicAttributes & any) => React.JSX.Element;
+/// <reference types="react" />
+declare const ItemEncode: (props: JSX.IntrinsicAttributes & any) => JSX.Element;
 export default ItemEncode;

package/dist/esm/components/EItemId/ItemId.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import { GoodsProps } from '@kmkf-fe-packages/basic-components/dist/common/Goods';
-declare const ItemId: (props: JSX.IntrinsicAttributes & GoodsProps) => React.JSX.Element;
+declare const ItemId: (props: JSX.IntrinsicAttributes & GoodsProps) => JSX.Element;
 export default ItemId;

package/dist/esm/components/EItemSelect/ItemSelect.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import { GoodsProps } from '@kmkf-fe-packages/basic-components/dist/common/Goods';
-declare const ItemSelect: (props: JSX.IntrinsicAttributes & GoodsProps) => React.JSX.Element;
+declare const ItemSelect: (props: JSX.IntrinsicAttributes & GoodsProps) => JSX.Element;
 export default ItemSelect;

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

@@ -1,3 +1,3 @@
-import React from 'react';
-declare const ExpressCompany: (props: any) => React.JSX.Element;
+/// <reference types="react" />
+declare const ExpressCompany: (props: any) => JSX.Element;
 export default ExpressCompany;

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

@@ -7,7 +7,7 @@ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key i
 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 { Menu } from 'antd';
+import { Dropdown, Menu } from 'antd';
 import { ApaasSelect } from '@kmkf-fe-packages/basic-components';
 import { filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
 import GetFormItem from "../GetFormItem";
@@ -51,16 +51,13 @@ var WorkOrderId = /*#__PURE__*/_createClass(function WorkOrderId(options) {
   });
   _defineProperty(this, "renderPc", function (value, record) {
     var status = get(_this.workOrderStatus, record === null || record === void 0 ? void 0 : record["".concat(_this.id)]);
-    return status ?
-    /*#__PURE__*/
-    // <Dropdown overlay={this.renderMenu(record)}>
-    React.createElement("span", {
+    return status ? /*#__PURE__*/React.createElement(Dropdown, {
+      overlay: _this.renderMenu(record)
+    }, /*#__PURE__*/React.createElement("span", {
       style: {
         color: status.color
       }
-    }, status === null || status === void 0 ? void 0 : status.label)
-    // </Dropdown>
-    : /*#__PURE__*/React.createElement("span", null, "--");
+    }, status === null || status === void 0 ? void 0 : status.label)) : /*#__PURE__*/React.createElement("span", null, "--");
   });
   _defineProperty(this, "renderLog", function (r) {
     var status = get(_this.workOrderStatus, r === null || r === void 0 ? void 0 : r["".concat(_this.id)]);

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

@@ -7,5 +7,5 @@ declare type GetFormItemProps = {
     component: JSX.Element | null;
     hidden?: boolean;
 };
-declare const GetFormItem: ({ rules, required, title, component, name, hidden }: GetFormItemProps) => React.JSX.Element;
+declare const GetFormItem: ({ rules, required, title, component, name, hidden }: GetFormItemProps) => React.JSX.Element | null;
 export default GetFormItem;

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

@@ -15,6 +15,8 @@ var GetFormItem = function GetFormItem(_ref) {
       message: "\u8BF7\u8F93\u5165".concat(title)
     });
   }
+  // 当隐藏时, 不在拥有该组件
+  if (hidden) return null;
   return /*#__PURE__*/React.createElement("div", {
     className: "form-item--wrap",
     style: {
@@ -24,8 +26,8 @@ var GetFormItem = function GetFormItem(_ref) {
     name: name,
     label: title,
     rules: newRules,
-    className: "form-item-label--index",
-    hidden: hidden
+    className: "form-item-label--index"
+    // hidden={hidden}
   }, component));
 };
 export default GetFormItem;

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

@@ -1,3 +1,3 @@
-import React from 'react';
-declare const Popover: ({ Overlay, ShowComponent }: any) => React.JSX.Element;
+/// <reference types="react" />
+declare const Popover: ({ Overlay, ShowComponent }: any) => JSX.Element;
 export default Popover;

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

@@ -1,4 +1,4 @@
-import React from 'react';
+/// <reference types="react" />
 import { GoodsProps } from '@kmkf-fe-packages/basic-components/dist/common/Goods';
-declare const ItemEncode: (props: JSX.IntrinsicAttributes & GoodsProps) => React.JSX.Element;
+declare const ItemEncode: (props: JSX.IntrinsicAttributes & GoodsProps) => JSX.Element;
 export default ItemEncode;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.7.14-alpha.0",
+  "version": "0.7.14-alpha.13",
   "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.14-alpha.0",
-    "@kmkf-fe-packages/kmkf-utils": "^0.7.14-alpha.0"
+    "@kmkf-fe-packages/basic-components": "^0.7.14-alpha.13",
+    "@kmkf-fe-packages/kmkf-utils": "^0.7.14-alpha.9"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "678546f4f78df3f93ba9fb2d57382c81e37ea8db"
+  "gitHead": "9be3679577165c64c1de730d9aa5cc7e660f11f8"
 }