kmkf-work-order-service-component 0.4.0-alpha.22 → 0.4.0-alpha.23

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/components/CustomizeWorkOrderCard/index.js

@@ -38,14 +38,21 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 
 function CustomizeWorkOrderCard(props) {
-  var _WORK_ORDER_STATUS$it, _item$jsonMap, _item$handlerList, _item$handlerList$map;
+  var _item$handlerList, _item$handlerList$map;
 
   var item = props.item,
       enabledTemplateList = props.enabledTemplateList;
   var dispatch = useAppDispatch();
   var componentDtoList = useAppSelector(selectorAllTemplateList);
   var filterComponentDtoList = componentDtoList.filter(function (i) {
-    return !['WORK_ORDER_ID_INPUT', 'TEMPLATE_ID_INPUT', 'FLOW_STATUS_SELECT', 'HANDLER_INPUT', 'COMPLETED_USER_INPUT'].includes(i.workOrderComponentType);
+    return !['WORK_ORDER_ID_INPUT', // 工单ID
+    'TEMPLATE_ID_INPUT', // 模板Id
+    'FLOW_STATUS_SELECT', // 工单状态
+    'HANDLER_INPUT', // 处理人
+    'OPERATOR_INPUT', // 提交人
+    'CREATED_DATETIME', // 创建时间
+    'SHOP_INPUT' // 店铺
+    ].includes(i.workOrderComponentType);
   });
 
   var _calcWorkOrderList = calcWorkOrderList([_objectSpread({}, item)], filterComponentDtoList),
@@ -158,8 +165,7 @@ function CustomizeWorkOrderCard(props) {
 
   var ItemView = function ItemView(_ref) {
     var label = _ref.label,
-        value = _ref.value,
-        key = _ref.key;
+        value = _ref.value;
     return /*#__PURE__*/_jsxs("div", {
       className: "orderItemView",
       children: [/*#__PURE__*/_jsxs("div", {
@@ -169,7 +175,7 @@ function CustomizeWorkOrderCard(props) {
         className: "itemViewRight",
         children: value
       })]
-    }, key);
+    });
   };
 
   return /*#__PURE__*/_jsxs("div", {
@@ -181,9 +187,6 @@ function CustomizeWorkOrderCard(props) {
       label: "\u63D0\u4EA4\u5BA2\u670D",
       value: transData.submitter
     }, "submitter"), /*#__PURE__*/_jsx(ItemView, {
-      label: "\u5DE5\u5355\u72B6\u6001",
-      value: (_WORK_ORDER_STATUS$it = WORK_ORDER_STATUS[item === null || item === void 0 ? void 0 : (_item$jsonMap = item.jsonMap) === null || _item$jsonMap === void 0 ? void 0 : _item$jsonMap.flowStatus]) === null || _WORK_ORDER_STATUS$it === void 0 ? void 0 : _WORK_ORDER_STATUS$it.label
-    }, "flowStatus"), /*#__PURE__*/_jsx(ItemView, {
       label: "\u5904\u7406\u5BA2\u670D",
       value: item === null || item === void 0 ? void 0 : (_item$handlerList = item.handlerList) === null || _item$handlerList === void 0 ? void 0 : (_item$handlerList$map = _item$handlerList.map(function (i) {
         return i.account;
@@ -196,10 +199,7 @@ function CustomizeWorkOrderCard(props) {
       style: {
         margin: '8px 0'
       }
-    }), /*#__PURE__*/_jsx(ItemView, {
-      label: "\u5E97\u94FA\u540D\u79F0",
-      value: transData.shopName
-    }, "shopName"), filterComponentDtoList.map(function (t) {
+    }), filterComponentDtoList.map(function (t) {
       var instance = factory(t.workOrderComponentType, {
         id: t.uniqueKey,
         name: t.name,

package/dist/esm/WorkOrder/components/CustomizeWorkOrderList/index.js

@@ -217,12 +217,22 @@ var CustomizeWorkOrderList = function CustomizeWorkOrderList(_ref4) {
         gutter: 24,
         children: [/*#__PURE__*/_jsx(Col, {
           span: 24,
-          children: /*#__PURE__*/_jsx(Form.Item, {
-            name: "time",
-            label: "\u63D0\u4EA4\u65F6\u95F4",
-            children: /*#__PURE__*/_jsx(RangePicker, {
-              placeholder: ['开始提交时间', '结束提交时间']
-            })
+          children: /*#__PURE__*/_jsxs("div", {
+            style: {
+              display: 'flex',
+              alignItems: 'center'
+            },
+            children: [/*#__PURE__*/_jsx("span", {
+              style: {
+                width: '64px'
+              },
+              children: "\u63D0\u4EA4\u65F6\u95F4"
+            }), /*#__PURE__*/_jsx(Form.Item, {
+              name: "time",
+              children: /*#__PURE__*/_jsx(RangePicker, {
+                placeholder: ['开始提交时间', '结束提交时间']
+              })
+            })]
           })
         }), /*#__PURE__*/_jsx(Col, {
           span: 12,

package/dist/esm/WorkOrder/components/PaymentWorkOrderList/index.js

@@ -160,12 +160,22 @@ var PaymentWorkOrderList = function PaymentWorkOrderList(_ref) {
         gutter: 24,
         children: [/*#__PURE__*/_jsx(Col, {
           span: 24,
-          children: /*#__PURE__*/_jsx(Form.Item, {
-            name: "time",
-            label: "\u63D0\u4EA4\u65F6\u95F4",
-            children: /*#__PURE__*/_jsx(RangePicker, {
-              placeholder: ['开始提交时间', '结束提交时间']
-            })
+          children: /*#__PURE__*/_jsxs("div", {
+            style: {
+              display: 'flex',
+              alignItems: 'center'
+            },
+            children: [/*#__PURE__*/_jsx("span", {
+              style: {
+                width: '64px'
+              },
+              children: "\u63D0\u4EA4\u65F6\u95F4"
+            }), /*#__PURE__*/_jsx(Form.Item, {
+              name: "time",
+              children: /*#__PURE__*/_jsx(RangePicker, {
+                placeholder: ['开始提交时间', '结束提交时间']
+              })
+            })]
           })
         }), /*#__PURE__*/_jsx(Col, {
           span: 8,

package/dist/esm/WorkOrder/components/Widget/basic/CommonDataTime/index.d.ts

@@ -0,0 +1,10 @@
+/// <reference types="react" />
+import BasicComponent from '../../BasicComponent';
+declare class CommonDataTime extends BasicComponent {
+    constructor(options: any);
+    render: (value: any, record: any) => JSX.Element;
+    editRender: () => null;
+    renderExport: (value: any, record: any) => string;
+    getColumns: () => any;
+}
+export default CommonDataTime;

package/dist/esm/WorkOrder/components/Widget/basic/CommonDataTime/index.js

@@ -0,0 +1,90 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
+
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
+
+function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function _get() { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get.bind(); } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(arguments.length < 3 ? target : receiver); } return desc.value; }; } return _get.apply(this, arguments); }
+
+function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; }
+
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
+import React from 'react';
+import BasicComponent from "../../BasicComponent";
+import moment from 'moment';
+import { jsx as _jsx } from "react/jsx-runtime";
+
+var CommonDataTime = /*#__PURE__*/function (_BasicComponent) {
+  _inherits(CommonDataTime, _BasicComponent);
+
+  var _super = _createSuper(CommonDataTime);
+
+  function CommonDataTime(options) {
+    var _thisSuper, _this;
+
+    _classCallCheck(this, CommonDataTime);
+
+    _this = _super.call(this, options);
+
+    _defineProperty(_assertThisInitialized(_this), "render", function (value, record) {
+      if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) === undefined) {
+        return /*#__PURE__*/_jsx("span", {
+          children: "--"
+        });
+      }
+
+      return /*#__PURE__*/_jsx("span", {
+        children: moment(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]).format('YYYY-MM-DD HH:mm:ss')
+      });
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "editRender", function () {
+      return null;
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "renderExport", function (value, record) {
+      if ((record === null || record === void 0 ? void 0 : record["".concat(_this.id)]) === undefined) {
+        return '--';
+      }
+
+      return moment(record === null || record === void 0 ? void 0 : record["".concat(_this.id)]).format('YYYY-MM-DD HH:mm:ss');
+    });
+
+    _defineProperty(_assertThisInitialized(_this), "getColumns", function () {
+      return _objectSpread(_objectSpread({}, _get((_thisSuper = _assertThisInitialized(_this), _getPrototypeOf(CommonDataTime.prototype)), "getColumns", _thisSuper).call(_thisSuper)), {}, {
+        renderExport: _this.renderExport
+      });
+    });
+
+    _this.canFilter = true;
+    _this.canGroup = true;
+    _this.canHidden = true;
+    _this.editable = true;
+    return _this;
+  }
+
+  return _createClass(CommonDataTime);
+}(BasicComponent);
+
+export default CommonDataTime;

package/dist/esm/WorkOrder/components/Widget/electricity/ERemark/index.js

@@ -40,12 +40,18 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import React from 'react';
 import BasicComponent from "../../BasicComponent";
 import { getFormItem } from "../../common/formItemWrap";
-import { Remark } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets'; // import Flag from './Flag';
+import { Remark } from '@raycloud-apaas-fe-setup/apaas-react-basics-widgets';
+import trade0 from "../../../../../assets/flag/trade-icon-flag-0.png";
+import trade1 from "../../../../../assets/flag/trade-icon-flag-1.png";
+import trade2 from "../../../../../assets/flag/trade-icon-flag-2.png";
+import trade3 from "../../../../../assets/flag/trade-icon-flag-3.png";
+import trade4 from "../../../../../assets/flag/trade-icon-flag-4.png";
+import trade5 from "../../../../../assets/flag/trade-icon-flag-5.png";
+import { get } from 'lodash'; // const flagColors = ['gray', 'red', 'yellow', 'green', 'blue', 'purple'];
 
-import { get } from 'lodash';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var flagColors = ['gray', 'red', 'yellow', 'green', 'blue', 'purple'];
+var imgList = [trade0, trade1, trade2, trade3, trade4, trade5];
 
 var ERemark = /*#__PURE__*/function (_BasicComponent) {
   _inherits(ERemark, _BasicComponent);
@@ -64,8 +70,8 @@ var ERemark = /*#__PURE__*/function (_BasicComponent) {
         style: {
           display: 'inline-block'
         },
-        children: [get(value, 'flag') + '' ? /*#__PURE__*/_jsx("i", {
-          className: "dz-iconfont dz-beizhu_qizhi f-lt ft_12 mr_5 ".concat(flagColors[get(value, 'flag')])
+        children: [get(value, 'flag') ? /*#__PURE__*/_jsx("img", {
+          src: imgList[get(value, 'flag')]
         }) : null, /*#__PURE__*/_jsx("span", {
           children: get(value, 'remark')
         })]

package/dist/esm/WorkOrder/components/Widget/index.d.ts

@@ -10,6 +10,7 @@ import BasicCascader from '../Widget/basic/Cascader';
 import BasicAddress from '../Widget/basic/Address';
 import BasicGrade from '../Widget/basic/Grade';
 import BasicRate from '../Widget/basic/Rate';
+import CommonDataTime from '../Widget/basic/CommonDataTime';
 import EBuyerNick from '../Widget/electricity/EBuyerNick';
 import EReceiverAddress from '../Widget/electricity/EReceiverAddress';
 import ELogistics from '../Widget/electricity/ELogistics';
@@ -23,4 +24,4 @@ import Status from '../Widget/third/Status';
 import Ordinary from '../Widget/third/Ordinary';
 import ItemSelectThird from '../Widget/third/ItemSelect';
 import Payment from '../Widget/third/Payment';
-export declare const factory: (type: string, options: any) => BasicInput | BasicRadio | BasicTextArea | BasicCheckBox | BasicDateTime | BasicSelect | BasicPicture | BasicMultSelect | BasicCascader | BasicAddress | BasicGrade | BasicRate | EBuyerNick | EReceiverAddress | ELogistics | EReturnLogistics | ERemark | EItemSelect | EItemId | EItemEncode | EAlipay | Status | Ordinary | ItemSelectThird | Payment;
+export declare const factory: (type: string, options: any) => BasicInput | BasicRadio | BasicTextArea | BasicCheckBox | BasicDateTime | BasicSelect | BasicPicture | BasicMultSelect | BasicCascader | BasicAddress | BasicGrade | BasicRate | CommonDataTime | EBuyerNick | EReceiverAddress | ELogistics | EReturnLogistics | ERemark | EItemSelect | EItemId | EItemEncode | EAlipay | Status | Ordinary | ItemSelectThird | Payment;

package/dist/esm/WorkOrder/components/Widget/index.js

@@ -10,6 +10,7 @@ import BasicCascader from "../Widget/basic/Cascader";
 import BasicAddress from "../Widget/basic/Address";
 import BasicGrade from "../Widget/basic/Grade";
 import BasicRate from "../Widget/basic/Rate";
+import CommonDataTime from "../Widget/basic/CommonDataTime";
 import EShopName from "../Widget/electricity/ShopName";
 import ETradeId from "../Widget/electricity/ETradeId";
 import EBuyerNick from "../Widget/electricity/EBuyerNick";
@@ -131,6 +132,15 @@ export var factory = function factory(type, options) {
     case 'SYSTEM_ORDER_NO':
       return new SystemOrderNo(options);
 
+    case 'COMPLETED_DATETIME':
+      return new CommonDataTime(options);
+
+    case 'CREATED_DATETIME':
+      return new CommonDataTime(options);
+
+    case 'UPDATE_DATETIME':
+      return new CommonDataTime(options);
+
     default:
       return new BasicInput(options);
   }

package/dist/esm/common/utils/tools.d.ts

@@ -3,7 +3,7 @@
  * @param {*} value
  * @returns
  */
-export declare const isNull: (value: number) => boolean;
+export declare const isNull: (p: any) => boolean;
 export declare const findLabelBySelectValue: (vales: any[], options: {
     [x: string]: {
         [x: string]: any;

package/dist/esm/common/utils/tools.js

@@ -38,17 +38,17 @@ var ONLY_SHOW_COMPONENT_TYPE = ['RADIO', 'INPUT', 'TEXTAREA', 'CHECKBOX', 'SELEC
  */
 
 export var isNull = function isNull(value) {
-  if (value === 0) {
-    return false;
-  }
-
   if (_typeof(value) === 'object' && value !== null) {
     return every(Object.values(value), function (v) {
-      return isEmpty(v) && v !== 0;
+      return isNull(v);
     });
   }
 
-  return isEmpty(value);
+  if (Array.isArray(value)) {
+    return value.length === 0;
+  }
+
+  return !value;
 };
 var workTypeKeys = {
   // TRADE_ID_INPUT: 'tradeId', //订单号

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kmkf-work-order-service-component",
-  "version": "0.4.0-alpha.22",
+  "version": "0.4.0-alpha.23",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",