@kmkf-fe-packages/services-components 0.8.0 → 0.8.3

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

@@ -141,7 +141,7 @@ var BsExchange = /*#__PURE__*/_createClass(function BsExchange(options) {
   this.isCombinationComponent = true;
   this.canSort = false;
   this.bsType = new BsType(_objectSpread(_objectSpread({}, options), {}, {
-    id: "".concat(options.id, "_bsExchangeType_type"),
+    id: "".concat(options.id, "_bsExchangeType"),
     name: '换货类型'
   }));
   this.bsMemo = new BsMemo(_objectSpread(_objectSpread({}, options), {}, {

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

@@ -117,7 +117,7 @@ var BsReissue = /*#__PURE__*/_createClass(function BsReissue(options) {
   this.isCombinationComponent = true;
   this.canSort = false;
   this.bsType = new BsType(_objectSpread(_objectSpread({}, options), {}, {
-    id: "".concat(options.id, "_bsReissueType_type"),
+    id: "".concat(options.id, "_bsReissueType"),
     name: '补发类型'
   }));
   this.bsMemo = new BsMemo(_objectSpread(_objectSpread({}, options), {}, {

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

@@ -87,11 +87,11 @@ var BsType = /*#__PURE__*/_createClass(function BsType(options) {
   _defineProperty(this, "filterConfig", function (item) {
     var _item$config;
     var subKey = item.subKey;
-    console.log('bsTypefilterConfig', item);
+    var id = _this.getParentId();
     return {
       searchDefaultConditions: SYMBOL.in,
       type: item.type,
-      id: item.id,
+      id: _this.id,
       name: "".concat(item.name, "-\u7C7B\u578B"),
       filterComponentType: 'Cascader',
       props: {

package/dist/esm/components/Payment/AlipayTime.d.ts

@@ -16,9 +16,10 @@ declare class AlipayTime implements ComponentInterface {
     dataType: ComponentInterface['dataType'];
     format: ComponentInterface['format'];
     constructor(options: PickOption);
+    dateTimeTrans: (v: number | string) => string;
     renderClient: (record: Record) => React.JSX.Element | null;
-    renderPc: (value: unknown, record: Record) => any;
-    renderLog: (r: Record) => any;
+    renderPc: (value: unknown, record: Record) => string;
+    renderLog: (r: Record) => string | null;
     getComponentValue: (r: Record) => any;
     renderExport: (value: string) => string | null;
     editRender: (p: any) => React.JSX.Element;

package/dist/esm/components/Payment/AlipayTime.js

@@ -29,16 +29,28 @@ var AlipayTime = /*#__PURE__*/_createClass(function AlipayTime(options) {
   _defineProperty(this, "children", void 0);
   _defineProperty(this, "dataType", void 0);
   _defineProperty(this, "format", void 0);
+  _defineProperty(this, "dateTimeTrans", function (v) {
+    if (typeof v === 'number') {
+      return moment(v).format('YYYY-MM-DD HH:mm:ss');
+    }
+    if (typeof v === 'string') {
+      if (/^\d+$/.test(v)) {
+        return moment(Number(v)).format('YYYY-MM-DD HH:mm:ss');
+      }
+      return v;
+    }
+    return v;
+  });
   _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: record !== null && record !== void 0 && record[_this.id] ? moment(record === null || record === void 0 ? void 0 : record[_this.id]).format('YYYY-MM-DD HH:mm:ss') : '--'
+      value: record !== null && record !== void 0 && record[_this.id] ? _this.dateTimeTrans(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 : '--';
+    var _this$dateTimeTrans;
+    return (_this$dateTimeTrans = _this.dateTimeTrans(record === null || record === void 0 ? void 0 : record["".concat(_this.id)])) !== null && _this$dateTimeTrans !== void 0 ? _this$dateTimeTrans : '--';
     // if (record?.[this.id] === undefined) {
     //   return <span>--</span>;
     // }
@@ -56,7 +68,7 @@ var AlipayTime = /*#__PURE__*/_createClass(function AlipayTime(options) {
     return r === null || r === void 0 ? void 0 : r["".concat(_this.id)];
   });
   _defineProperty(this, "renderExport", function (value) {
-    return value ? moment(value).format('YYYY-MM-DD HH:mm:ss') : null;
+    return value ? _this.dateTimeTrans(value) : null;
   });
   _defineProperty(this, "editRender", function (p) {
     var _this$componentConfig, _this$componentConfig2;

package/dist/esm/type.d.ts

@@ -168,7 +168,7 @@ export interface ComponentInterface {
      * @param r
      * @returns
      */
-    renderLog: (r: Record) => JSX.Element | null | JSX.Element[];
+    renderLog: (r: Record) => JSX.Element | null | JSX.Element[] | string;
     /**
      * 客户端卡片字段渲染,record的格式为下面这种,可以直接使用
      * {
@@ -187,7 +187,7 @@ export interface ComponentInterface {
      * @param record
      * @returns
      */
-    renderPc: (value: unknown, record: Record) => JSX.Element | null | JSX.Element[];
+    renderPc: (value: unknown, record: Record) => JSX.Element | null | JSX.Element[] | string;
     /**
      * 导出时渲染
      * @param p

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.8.0",
+  "version": "0.8.3",
   "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.8.0",
-    "@kmkf-fe-packages/kmkf-utils": "^0.8.0"
+    "@kmkf-fe-packages/basic-components": "^0.8.1",
+    "@kmkf-fe-packages/kmkf-utils": "^0.8.1"
   },
   "peerDependencies": {
     "@ant-design/icons": "^4.7.0",
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "cc6ccff667c191b641cc259b002a7e022fe7931c"
+  "gitHead": "2fdfceaed25216a6ab0e0686be7a5aa572befdb4"
 }