@kmkf-fe-packages/services-components 0.10.0-alpha.1 → 0.10.0-alpha.2

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

@@ -16,7 +16,7 @@ declare class FlowMarkSelect implements ComponentInterface {
     dataType: ComponentInterface["dataType"];
     constructor(options: PickOption);
     renderPc: (value: any, record: Record) => React.JSX.Element;
-    renderLog: (r: Record) => React.JSX.Element | null;
+    renderLog: (r: Record) => any;
     getComponentValue: (r: Record) => any;
     renderExport: (value: any, record: Record) => any;
     renderClient: (record: any) => React.JSX.Element | null;

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

@@ -15,6 +15,12 @@ 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 xing from "../../commonComponents/SelectMark/img/xingxing.png";
+import xingRed from "../../commonComponents/SelectMark/img/xingxing-red.png";
+import xingYellow from "../../commonComponents/SelectMark/img/xingxing-yellow.png";
+import xingBlue from "../../commonComponents/SelectMark/img/xingxing-blue.png";
+import xingGreen from "../../commonComponents/SelectMark/img/xingxing-green.png";
+import xingPurple from "../../commonComponents/SelectMark/img/xingxing-purple.png";
 var FlowMarkSelect = /*#__PURE__*/_createClass(function FlowMarkSelect(options) {
   var _this = this;
   _classCallCheck(this, FlowMarkSelect);
@@ -46,13 +52,10 @@ var FlowMarkSelect = /*#__PURE__*/_createClass(function FlowMarkSelect(options)
       return item.value === (r === null || r === void 0 ? void 0 : r["".concat(_this.id)]);
     });
     if (!mark) return null;
-    return _this.renderPc(undefined, r);
+    return mark === null || mark === void 0 ? void 0 : mark.label;
   });
   _defineProperty(this, "getComponentValue", function (r) {
-    var mark = _this.workOrderMark.find(function (item) {
-      return item.value === (r === null || r === void 0 ? void 0 : r["".concat(_this.id)]);
-    });
-    return mark;
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id)];
   });
   _defineProperty(this, "renderExport", function (value, record) {
     var MARK_MAP = {
@@ -69,11 +72,15 @@ var FlowMarkSelect = /*#__PURE__*/_createClass(function FlowMarkSelect(options)
     return mark ? MARK_MAP[mark === null || mark === void 0 ? void 0 : mark.value] : "--";
   });
   _defineProperty(this, "renderClient", function (record) {
-    return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
+    if (!isNull(record === null || record === void 0 ? void 0 : record[_this.id])) return null;
+    var mark = _this.workOrderMark.find(function (item) {
+      return item.value === (record === null || record === void 0 ? void 0 : record["".concat(_this.id)]);
+    });
+    return /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: (record === null || record === void 0 ? void 0 : record[_this.id]) || ""
-    }) : null;
+      value: mark === null || mark === void 0 ? void 0 : mark.label
+    });
   });
   _defineProperty(this, "editRender", function (p) {
     var _this$componentConfig, _this$componentConfig2;
@@ -137,47 +144,50 @@ var FlowMarkSelect = /*#__PURE__*/_createClass(function FlowMarkSelect(options)
   this.canSort = false;
   this.children = [];
   this.workOrderMark = [{
-    label: /*#__PURE__*/React.createElement("span", {
-      className: "iconfont icon-xingxing"
+    label: /*#__PURE__*/React.createElement("img", {
+      src: xing,
+      style: {
+        width: "16px"
+      }
     }),
     value: "1"
   }, {
-    label: /*#__PURE__*/React.createElement("span", {
-      className: "iconfont icon-xingxing1",
+    label: /*#__PURE__*/React.createElement("img", {
+      src: xingRed,
       style: {
-        color: "#ff0000"
+        width: "16px"
       }
     }),
     value: "2"
   }, {
-    label: /*#__PURE__*/React.createElement("span", {
-      className: "iconfont icon-xingxing1",
+    label: /*#__PURE__*/React.createElement("img", {
+      src: xingYellow,
       style: {
-        color: "#f6b343"
+        width: "16px"
       }
     }),
     value: "3"
   }, {
-    label: /*#__PURE__*/React.createElement("span", {
-      className: "iconfont icon-xingxing1",
+    label: /*#__PURE__*/React.createElement("img", {
+      src: xingBlue,
       style: {
-        color: "#4d90f7"
+        width: "16px"
       }
     }),
     value: "4"
   }, {
-    label: /*#__PURE__*/React.createElement("span", {
-      className: "iconfont icon-xingxing1",
+    label: /*#__PURE__*/React.createElement("img", {
+      src: xingGreen,
       style: {
-        color: "#6ed86c"
+        width: "16px"
       }
     }),
     value: "5"
   }, {
-    label: /*#__PURE__*/React.createElement("span", {
-      className: "iconfont icon-xingxing1",
+    label: /*#__PURE__*/React.createElement("img", {
+      src: xingPurple,
       style: {
-        color: "#be4ed1"
+        width: "16px"
       }
     }),
     value: "6"

package/dist/esm/factory.d.ts

@@ -1,3 +1,3 @@
 import { JstLogistics, JstItemSelect, JstSupply, JstSendGood, BasicInput, BasicAddress, BasicCascader, BasicCheckbox, BasicDataTime, BasicSelect, BasicRadio, BasicTextArea, BasicPicture, BasicMultSelect, BasicGrade, BasicRate, BasicFile, BasicPosting, CommonDataTime, TradeId, ShopName, ErpTradeId, BuyerNick, ReceiverName, ReceiverMobile, ReceiverAddress, TradeDateTime, Logistics, ReturnLogistics, ActualPayment, ERemark, AliPay, ItemSelect, ItemId, ItemEnCode, SystemOrderNo, Ordinary, ThirdItemSelect, FlowStatusSelect, FlowMarkSelect, Payment, TemplateSelect, WorkOrderId, PlatForm, ShopInput, Submitter, Handler, CompletedUser, LogisticsInterception, LogisticsTrajectory, FlowWorkOrderId, BsGoods, BsExchange, BsReissue, BsReturn, BsSystemOrder, BsLogistics, StatusSelect, CommonTradeId, CommonSystemOrder, CommonMultiStatus, Calculation, NodeDeadLine, HandlerDeadLine, NodeStayDuration } from "./index";
 import { PickOption } from "./type";
-export declare const factory: (type: string, options: PickOption) => BsLogistics | BsReturn | Calculation | CommonMultiStatus | CommonSystemOrder | CommonTradeId | BasicFile | FlowMarkSelect | HandlerDeadLine | JstLogistics | LogisticsInterception | NodeDeadLine | NodeStayDuration | BasicPosting | StatusSelect | TradeId | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | CommonDataTime | ErpTradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstItemSelect | JstSendGood | JstSupply | BsSystemOrder | BsGoods | BsExchange | BsReissue | FlowStatusSelect | TemplateSelect | WorkOrderId | LogisticsTrajectory | PlatForm | ShopInput | Submitter | Handler | CompletedUser | FlowWorkOrderId;
+export declare const factory: (type: string, options: PickOption) => FlowMarkSelect | StatusSelect | BasicInput | BasicAddress | BasicCascader | BasicCheckbox | BasicDataTime | BasicSelect | BasicRadio | BasicTextArea | BasicPicture | BasicMultSelect | BasicGrade | BasicRate | BasicFile | BasicPosting | CommonDataTime | TradeId | ErpTradeId | ShopName | BuyerNick | ReceiverName | ReceiverMobile | ReceiverAddress | TradeDateTime | Logistics | ReturnLogistics | ActualPayment | ERemark | AliPay | ItemSelect | ItemId | ItemEnCode | SystemOrderNo | Ordinary | ThirdItemSelect | Payment | JstLogistics | JstItemSelect | JstSendGood | JstSupply | BsSystemOrder | BsGoods | BsExchange | BsReissue | BsReturn | BsLogistics | FlowStatusSelect | TemplateSelect | WorkOrderId | LogisticsInterception | LogisticsTrajectory | PlatForm | ShopInput | Submitter | Handler | CompletedUser | FlowWorkOrderId | CommonTradeId | Calculation | CommonSystemOrder | CommonMultiStatus | NodeDeadLine | HandlerDeadLine | NodeStayDuration;

package/dist/esm/factory.js

@@ -151,10 +151,13 @@ export var factory = function factory(type, options) {
     case "NUMERICAL_CALCULATION":
       return new Calculation(options);
     case "NODE_DEAD_LINE_INPUT":
+      // 工单时效
       return new NodeDeadLine(options);
     case "HANDLER_DEAD_LINE_INPUT":
+      // 处理人时效
       return new HandlerDeadLine(options);
     case "NODE_STAY_DURATION_INPUT":
+      // 工单停留时长
       return new NodeStayDuration(options);
     default:
       return new BasicInput(options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "0.10.0-alpha.1",
+  "version": "0.10.0-alpha.2",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -40,5 +40,5 @@
   "gitHooks": {
     "pre-commit": "lint-staged"
   },
-  "gitHead": "581f3cb866aa95415207390cb4377690fd34b408"
+  "gitHead": "ffccb9d6a1dcab6b94533309e7869e93b5d62f1b"
 }