@kmkf-fe-packages/services-components 0.13.0-alpha.11 → 0.13.0-alpha.12

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

@@ -1,6 +1,6 @@
-import { ComponentInterface, PickOption, Record, ColumnConfig } from '../../type';
-import React from 'react';
-import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
+import { ComponentInterface, PickOption, Record, ColumnConfig } from "../../type";
+import React from "react";
+import { AddressData } from "@kmkf-fe-packages/kmkf-utils";
 declare type Value = (string | number)[] | undefined;
 declare class Address implements ComponentInterface {
     name: string;
@@ -14,7 +14,7 @@ declare class Address implements ComponentInterface {
     children: ComponentInterface[];
     componentConfig: ComponentInterface["componentConfig"];
     addressDateInstance: InstanceType<typeof AddressData>;
-    dataType: ComponentInterface['dataType'];
+    dataType: ComponentInterface["dataType"];
     constructor(options: PickOption);
     /**
      * 通过值计算展示内容
@@ -25,7 +25,7 @@ declare class Address implements ComponentInterface {
     transTextToNumber: (value?: string) => string | number | undefined;
     renderClient: (record: any) => React.JSX.Element | null;
     renderPc: (value: any, record: Record) => React.JSX.Element;
-    renderLog: (r: Record) => React.JSX.Element | null;
+    renderLog: (r: Record) => string;
     getComponentValue: (r: Record) => any[];
     renderExport: (value: any, record: any) => string;
     editRender: (p: any) => React.JSX.Element;

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

@@ -5,14 +5,14 @@ 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 { ApaasAddress } from '@kmkf-fe-packages/basic-components';
-import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
-import intersection from 'lodash/intersection';
+import React from "react";
+import { ApaasAddress } from "@kmkf-fe-packages/basic-components";
+import { AddressData } from "@kmkf-fe-packages/kmkf-utils";
+import intersection from "lodash/intersection";
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
-import every from 'lodash/every';
+import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
+import every from "lodash/every";
 import { SYMBOL } from "../../constant";
 var Address = /*#__PURE__*/_createClass(function Address(options) {
   var _this = this;
@@ -33,7 +33,7 @@ var Address = /*#__PURE__*/_createClass(function Address(options) {
     var _value$map;
     return value === null || value === void 0 ? void 0 : (_value$map = value.map(function (suffix) {
       return _this.addressDateInstance.getNameByCode(suffix);
-    })) === null || _value$map === void 0 ? void 0 : _value$map.join('');
+    })) === null || _value$map === void 0 ? void 0 : _value$map.join("");
   });
   _defineProperty(this, "transTextToNumber", function (value) {
     return value ? +value : value;
@@ -42,7 +42,7 @@ var Address = /*#__PURE__*/_createClass(function Address(options) {
     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) {
@@ -55,28 +55,34 @@ var Address = /*#__PURE__*/_createClass(function Address(options) {
       return !item;
     }) ? [] : address;
     return /*#__PURE__*/React.createElement("span", null, (_address = address) === null || _address === void 0 ? void 0 : _address.map(function (suffix) {
-      return _this.addressDateInstance.getNameByCode(suffix || '');
-    }).join(''));
+      return _this.addressDateInstance.getNameByCode(suffix || "");
+    }).join(""));
   });
   _defineProperty(this, "renderLog", function (r) {
-    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_basicProvince")])) return null;
-    return _this.renderPc(undefined, r);
+    var _address2;
+    var address = [_this.transTextToNumber(r["".concat(_this.id, "_basicProvince")]), _this.transTextToNumber(r["".concat(_this.id, "_basicCity")]), _this.transTextToNumber(r["".concat(_this.id, "_basicDistrict")])];
+    address = every(address, function (item) {
+      return !item;
+    }) ? [] : address;
+    return (_address2 = address) === null || _address2 === void 0 ? void 0 : _address2.map(function (suffix) {
+      return _this.addressDateInstance.getNameByCode(suffix || "");
+    }).join("");
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return !isNull(r["".concat(_this.id, "_basicProvince")]) ? [r["".concat(_this.id, "_basicProvince")], r["".concat(_this.id, "_basicCity")], r["".concat(_this.id, "_basicDistrict")]] : [];
   });
   _defineProperty(this, "renderExport", function (value, record) {
-    var _address2;
+    var _address3;
     if (record["".concat(_this.id, "_basicProvince")] === undefined) {
-      return '--';
+      return "--";
     }
     var address = [_this.transTextToNumber(record["".concat(_this.id, "_basicProvince")]), _this.transTextToNumber(record["".concat(_this.id, "_basicCity")]), _this.transTextToNumber(record["".concat(_this.id, "_basicDistrict")])];
     address = every(address, function (item) {
       return !item;
     }) ? [] : address;
-    return (_address2 = address) === null || _address2 === void 0 ? void 0 : _address2.map(function (suffix) {
-      return _this.addressDateInstance.getNameByCode(suffix || '');
-    }).join('');
+    return (_address3 = address) === null || _address3 === void 0 ? void 0 : _address3.map(function (suffix) {
+      return _this.addressDateInstance.getNameByCode(suffix || "");
+    }).join("");
   });
   _defineProperty(this, "editRender", function (p) {
     var _this$componentConfig, _this$componentConfig2;
@@ -97,18 +103,18 @@ var Address = /*#__PURE__*/_createClass(function Address(options) {
       // 过滤组件id
       name: item.name,
       // 过滤组件名称
-      filterComponentType: 'Cascader',
+      filterComponentType: "Cascader",
       props: {
         options: _this.addressDateInstance.addressOptions || [],
         fieldNames: {
-          label: 'label',
-          value: 'value',
-          children: 'children'
+          label: "label",
+          value: "value",
+          children: "children"
         }
       },
       filterFn: function filterFn(value) {
         return function (i) {
-          return intersection(value, _filterFn.filterTableListItemColumnValue(i, item.id, 'basicMultSelect')).length > 0;
+          return intersection(value, _filterFn.filterTableListItemColumnValue(i, item.id, "basicMultSelect")).length > 0;
         };
       },
       formatFilterValue: function formatFilterValue(val) {
@@ -123,7 +129,7 @@ var Address = /*#__PURE__*/_createClass(function Address(options) {
   this.sortField = "".concat(options.id, "_basicDistrict");
   this.formField = "".concat(options.id, "_basicDistrict");
   this.type = options.type;
-  this.dataType = 'object';
+  this.dataType = "object";
   this.isCombinationComponent = false;
   this.canSort = true;
   this.children = [];
@@ -133,8 +139,8 @@ var Address = /*#__PURE__*/_createClass(function Address(options) {
 }
 /**
  * 通过值计算展示内容
- * @param value 
- * @returns 
+ * @param value
+ * @returns
  */);
 
 export default Address;

package/dist/esm/components/BS/BsPosting/components/City/index.js

@@ -45,7 +45,8 @@ var City = /*#__PURE__*/_createClass(function City(options) {
     return _this.addressDateInstance.getNameByCode(r === null || r === void 0 ? void 0 : r[_this.id]);
   });
   _defineProperty(this, "renderExport", function (value) {
-    return value !== null && value !== void 0 ? value : '--';
+    var _this$addressDateInst;
+    return (_this$addressDateInst = _this.addressDateInstance.getNameByCode(value)) !== null && _this$addressDateInst !== void 0 ? _this$addressDateInst : '--';
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return r === null || r === void 0 ? void 0 : r["".concat(_this.id)];

package/dist/esm/components/BS/BsPosting/components/District/index.js

@@ -45,7 +45,8 @@ var District = /*#__PURE__*/_createClass(function District(options) {
     return _this.addressDateInstance.getNameByCode(r === null || r === void 0 ? void 0 : r[_this.id]);
   });
   _defineProperty(this, "renderExport", function (value) {
-    return value !== null && value !== void 0 ? value : '--';
+    var _this$addressDateInst;
+    return (_this$addressDateInst = _this.addressDateInstance.getNameByCode(value)) !== null && _this$addressDateInst !== void 0 ? _this$addressDateInst : '--';
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return r === null || r === void 0 ? void 0 : r["".concat(_this.id)];

package/dist/esm/components/BS/BsPosting/components/Province/index.js

@@ -45,7 +45,8 @@ var Province = /*#__PURE__*/_createClass(function Province(options) {
     return _this.addressDateInstance.getNameByCode(r === null || r === void 0 ? void 0 : r[_this.id]);
   });
   _defineProperty(this, "renderExport", function (value) {
-    return value !== null && value !== void 0 ? value : '--';
+    var _this$addressDateInst;
+    return (_this$addressDateInst = _this.addressDateInstance.getNameByCode(value)) !== null && _this$addressDateInst !== void 0 ? _this$addressDateInst : '--';
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return r === null || r === void 0 ? void 0 : r["".concat(_this.id)];

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

@@ -14,13 +14,25 @@ import { ApaasSelect } from "@kmkf-fe-packages/basic-components";
 import { isNull, filterFn as _filterFn } from "@kmkf-fe-packages/kmkf-utils";
 import GetFormItem from "../GetFormItem";
 import { SYMBOL } from "../../constant";
+import reject from "../Common/img/reject.png";
+import reminder from "../Common/img/reminder.png";
 var TAG_MAP = {
   REMINDER: "催单",
   REJECT: "驳回"
 };
 var TAG_ICON_MAP = {
-  REMINDER: "催单",
-  REJECT: "驳回"
+  REMINDER: /*#__PURE__*/React.createElement("img", {
+    src: reminder,
+    style: {
+      width: "16px"
+    }
+  }),
+  REJECT: /*#__PURE__*/React.createElement("img", {
+    src: reject,
+    style: {
+      width: "16px"
+    }
+  })
 };
 var FlowTag = /*#__PURE__*/_createClass(function FlowTag(options) {
   var _this = this;
@@ -99,7 +111,7 @@ var FlowTag = /*#__PURE__*/_createClass(function FlowTag(options) {
           label: "催单",
           value: "REMINDER"
         }, {
-          label: "暂存",
+          label: "驳回",
           value: "REJECT"
         }]
       },

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

@@ -1,6 +1,6 @@
-import { ComponentInterface, PickOption, Record } from '../../type';
-import React from 'react';
-import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
+import { ComponentInterface, PickOption, Record } from "../../type";
+import React from "react";
+import { AddressData } from "@kmkf-fe-packages/kmkf-utils";
 declare type Value = {
     address?: (string | number)[];
     detail?: string;
@@ -18,12 +18,12 @@ declare class BasicInput implements ComponentInterface {
     canSort: boolean;
     children: ComponentInterface[];
     addressDateInstance: InstanceType<typeof AddressData>;
-    dataType: ComponentInterface['dataType'];
+    dataType: ComponentInterface["dataType"];
     constructor(options: PickOption);
     render: (value: Value) => React.JSX.Element;
     transTextToNumber: (value?: string) => string | number | undefined;
     renderPc: (value: any, record: Record) => React.JSX.Element;
-    renderLog: (r: Record) => React.JSX.Element | null;
+    renderLog: (r: Record) => string;
     getComponentValue: (r: Record) => {
         address: any[];
         detail: any;

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

@@ -5,13 +5,13 @@ 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 { Address } from '@kmkf-fe-packages/basic-components';
-import { AddressData } from '@kmkf-fe-packages/kmkf-utils';
+import React from "react";
+import { Address } from "@kmkf-fe-packages/basic-components";
+import { AddressData } from "@kmkf-fe-packages/kmkf-utils";
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
-import { isNull } from '@kmkf-fe-packages/kmkf-utils';
-import every from 'lodash/every';
+import { isNull } from "@kmkf-fe-packages/kmkf-utils";
+import every from "lodash/every";
 var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
   var _this = this,
     _this$componentConfig3;
@@ -35,7 +35,7 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
       className: "pointer"
     }, value === null || value === void 0 ? void 0 : (_value$address = value.address) === null || _value$address === void 0 ? void 0 : _value$address.map(function (suffix) {
       return _this.addressDateInstance.getNameByCode(suffix);
-    }).join(''), value === null || value === void 0 ? void 0 : value.detail);
+    }).join(""), value === null || value === void 0 ? void 0 : value.detail);
   });
   _defineProperty(this, "transTextToNumber", function (value) {
     return value ? +value : value;
@@ -54,17 +54,25 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
       className: "pointer",
       onClick: function onClick(e) {
         var _this$effects, _this$effects2;
-        typeof (_this === null || _this === void 0 ? void 0 : (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.queryWorkOrderDetail) === 'function' && (_this === null || _this === void 0 ? void 0 : (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.queryWorkOrderDetail(record));
+        typeof (_this === null || _this === void 0 ? void 0 : (_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.queryWorkOrderDetail) === "function" && (_this === null || _this === void 0 ? void 0 : (_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : _this$effects2.queryWorkOrderDetail(record));
         e.stopPropagation();
       }
     }, (_address = address) === null || _address === void 0 ? void 0 : _address.map(function () {
-      var suffix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+      var suffix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
       return _this.addressDateInstance.getNameByCode(suffix);
-    }).join(''), detail);
+    }).join(""), detail);
   });
   _defineProperty(this, "renderLog", function (r) {
-    if (isNull(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_province")])) return null;
-    return _this.renderPc(undefined, r);
+    var _address2;
+    var address = [_this.transTextToNumber(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_province")]), _this.transTextToNumber(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_city")]), _this.transTextToNumber(r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_district")])];
+    address = every(address, function (item) {
+      return !item;
+    }) ? [] : address;
+    var detail = r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_address")];
+    return "".concat((_address2 = address) === null || _address2 === void 0 ? void 0 : _address2.map(function () {
+      var suffix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
+      return _this.addressDateInstance.getNameByCode(suffix);
+    }).join(""), " ").concat(detail || "");
   });
   _defineProperty(this, "getComponentValue", function (r) {
     return {
@@ -73,19 +81,19 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
     };
   });
   _defineProperty(this, "renderExport", function (value, record) {
-    var _address2;
+    var _address3;
     if (record["".concat(_this.id, "_province")] === undefined) {
-      return '--';
+      return "--";
     }
     var address = [_this.transTextToNumber(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_province")]), _this.transTextToNumber(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_city")]), _this.transTextToNumber(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_district")])];
     address = every(address, function (item) {
       return !item;
     }) ? [] : address;
     var detail = record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_address")];
-    return "".concat((_address2 = address) === null || _address2 === void 0 ? void 0 : _address2.map(function () {
-      var suffix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+    return "".concat((_address3 = address) === null || _address3 === void 0 ? void 0 : _address3.map(function () {
+      var suffix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : "";
       return _this.addressDateInstance.getNameByCode(suffix);
-    }).join(''), " ").concat(detail || '');
+    }).join(""), " ").concat(detail || "");
   });
   _defineProperty(this, "renderClient", function (record) {
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
@@ -121,16 +129,16 @@ var BasicInput = /*#__PURE__*/_createClass(function BasicInput(options) {
     validator: function validator(_, value) {
       var _value$address2;
       if (!(value !== null && value !== void 0 && (_value$address2 = value.address) !== null && _value$address2 !== void 0 && _value$address2.length)) {
-        return Promise.reject(new Error('请选择地址'));
+        return Promise.reject(new Error("请选择地址"));
       }
       if (!(value !== null && value !== void 0 && value.detail)) {
-        return Promise.reject(new Error('请填写详细地址'));
+        return Promise.reject(new Error("请填写详细地址"));
       }
       return Promise.resolve();
     }
   }] : [];
   this.effects = options.effects;
   this.addressDateInstance = AddressData.getInstance();
-  this.dataType = 'object';
+  this.dataType = "object";
 });
 export default BasicInput;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.13.0-alpha.11",
+  "version": "0.13.0-alpha.12",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "2f6f8c22a6121d908dc65f2c2fd5dfb86751decf"
+  "gitHead": "96c3764429747a78680ea91dc66927309fa7b979"
 }