@kmkf-fe-packages/services-components 2.10.9-beta.25 → 2.10.9-beta.27

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

@@ -31,7 +31,7 @@ declare class BasicPosting implements ComponentInterface {
     sortColumns: SortColumnsField;
     headerProvince: boolean;
     constructor(options: PickOption);
-    getChildren: () => (City | Detail | District | Province | ReceiverMobile | ReceiverName | undefined)[];
+    getChildren: () => (Province | City | District | Detail | ReceiverName | ReceiverMobile | undefined)[];
     getSortColumns: (sortColumns: string | undefined) => SortColumnsField;
     renderPc: (value: any, record: Record) => React.JSX.Element | null;
     renderLog: (r: Record) => React.JSX.Element | null;

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

@@ -17,9 +17,12 @@ declare class ERemark implements ComponentInterface {
     formField: string;
     canSort: boolean;
     children: ComponentInterface[];
+    effects: ComponentInterface['effects'];
     dataType: ComponentInterface['dataType'];
     constructor(options: PickOption);
-    render: (value: Value) => React.JSX.Element;
+    getShop: (record?: Record) => any;
+    isYouzan: (record?: Record) => boolean;
+    render: (value: Value, isYouzan?: boolean) => React.JSX.Element;
     renderClient: (record: Record) => React.JSX.Element | null;
     renderPc: (value: unknown, record: Record) => React.JSX.Element;
     renderLog: (r: Record) => React.JSX.Element | null;

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

@@ -1,4 +1,5 @@
 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 _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 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, _toPropertyKey(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"); } }
@@ -6,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 { Remark } from '@kmkf-fe-packages/basic-components';
+import { Remark, YouzanStar } from '@kmkf-fe-packages/basic-components';
 import GetFormItem from "../GetFormItem";
 import trade0 from "./flag/trade-icon-flag-0.png";
 import trade1 from "./flag/trade-icon-flag-1.png";
@@ -16,7 +17,7 @@ import trade4 from "./flag/trade-icon-flag-4.png";
 import trade5 from "./flag/trade-icon-flag-5.png";
 import get from 'lodash/get';
 import ItemView from "../../commonComponents/ItemView";
-import { isNull, filterFn as _filterFn } from '@kmkf-fe-packages/kmkf-utils';
+import { isNull, filterFn as _filterFn, isYouzanShop, normalizeYouzanStar } from '@kmkf-fe-packages/kmkf-utils';
 import { SYMBOL, batchInput, SEARCH_OPTIONS } from "../../constant";
 var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
   var _this = this,
@@ -34,14 +35,30 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
   _defineProperty(this, "formField", void 0);
   _defineProperty(this, "canSort", void 0);
   _defineProperty(this, "children", void 0);
+  _defineProperty(this, "effects", void 0);
   _defineProperty(this, "dataType", void 0);
+  _defineProperty(this, "getShop", function (record) {
+    var _this$effects, _this$effects2, _this$effects2$form, _this$effects3, _this$effects3$shopLi;
+    var shopId = (record === null || record === void 0 ? void 0 : record.shopId) || ((_this$effects = _this.effects) === null || _this$effects === void 0 ? void 0 : _this$effects.shopId) || ((_this$effects2 = _this.effects) === null || _this$effects2 === void 0 ? void 0 : (_this$effects2$form = _this$effects2.form) === null || _this$effects2$form === void 0 ? void 0 : _this$effects2$form.getFieldValue('shopId'));
+    return (_this$effects3 = _this.effects) === null || _this$effects3 === void 0 ? void 0 : (_this$effects3$shopLi = _this$effects3.shopList) === null || _this$effects3$shopLi === void 0 ? void 0 : _this$effects3$shopLi.find(function (shop) {
+      return shop.shopId === shopId;
+    });
+  });
+  _defineProperty(this, "isYouzan", function (record) {
+    return isYouzanShop(_this.getShop(record));
+  });
   _defineProperty(this, "render", function (value) {
+    var isYouzan = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
     var index = get(value, 'flag');
     return /*#__PURE__*/React.createElement("div", {
       style: {
         display: 'inline-block'
       }
-    }, index !== undefined && /*#__PURE__*/React.createElement("img", {
+    }, isYouzan ? normalizeYouzanStar(index) ? /*#__PURE__*/React.createElement(YouzanStar, {
+      compact: true,
+      disabled: true,
+      value: index
+    }) : null : index !== undefined && /*#__PURE__*/React.createElement("img", {
       src: _this.imgList[Number(index)]
     }), /*#__PURE__*/React.createElement("span", null, get(value, 'remark')));
   });
@@ -49,7 +66,7 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(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.render(record === null || record === void 0 ? void 0 : record[_this.id])
+      value: _this.render(record === null || record === void 0 ? void 0 : record[_this.id], _this.isYouzan(record))
     }) : null;
   });
   _defineProperty(this, "renderPc", function (value, record) {
@@ -57,11 +74,16 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
       return /*#__PURE__*/React.createElement("span", null, "--");
     }
     var index = get(record, "".concat(_this.id, "_flag"));
+    var isYouzan = _this.isYouzan(record);
     return /*#__PURE__*/React.createElement("div", {
       style: {
         display: 'inline-block'
       }
-    }, !isNull(get(record, "".concat(_this.id, "_flag"))) ? index !== undefined && /*#__PURE__*/React.createElement("img", {
+    }, !isNull(get(record, "".concat(_this.id, "_flag"))) ? isYouzan ? normalizeYouzanStar(index) && /*#__PURE__*/React.createElement(YouzanStar, {
+      compact: true,
+      disabled: true,
+      value: index
+    }) : index !== undefined && /*#__PURE__*/React.createElement("img", {
       src: _this.imgList[Number(index)]
     }) :
     // <i
@@ -94,7 +116,9 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
       display: p === null || p === void 0 ? void 0 : p.display,
       required: (_this$componentConfig = (_this$componentConfig2 = _this.componentConfig) === null || _this$componentConfig2 === void 0 ? void 0 : _this$componentConfig2.required) !== null && _this$componentConfig !== void 0 ? _this$componentConfig : false,
       tooltip: (_this$componentConfig3 = _this.componentConfig) !== null && _this$componentConfig3 !== void 0 && _this$componentConfig3.showTooltip ? (_this$componentConfig4 = _this.componentConfig) === null || _this$componentConfig4 === void 0 ? void 0 : _this$componentConfig4.tooltip : '',
-      component: /*#__PURE__*/React.createElement(Remark, _this.componentConfig)
+      component: /*#__PURE__*/React.createElement(Remark, _extends({}, _this.componentConfig, {
+        isYouzan: _this.isYouzan()
+      }))
     });
   });
   _defineProperty(this, "filterConfig", function (item) {
@@ -170,6 +194,7 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
   this.formField = "".concat(options.id, "_remark");
   this.type = options.type;
   this.componentConfig = options.componentConfig;
+  this.effects = options.effects;
   this.dataType = 'object';
   this.rules = (_this$componentConfig5 = this.componentConfig) !== null && _this$componentConfig5 !== void 0 && _this$componentConfig5.required ? [{
     validator: function validator(_, value) {
@@ -177,8 +202,11 @@ var ERemark = /*#__PURE__*/_createClass(function ERemark(options) {
       if (!(value !== null && value !== void 0 && value.remark)) {
         return Promise.reject(new Error('请输入备注'));
       }
-      if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.isShowFlag && !(value !== null && value !== void 0 && value.flag) && (value === null || value === void 0 ? void 0 : value.flag) !== 0) {
-        return Promise.reject(new Error('请选择旗帜'));
+      if ((_this$componentConfig6 = _this.componentConfig) !== null && _this$componentConfig6 !== void 0 && _this$componentConfig6.isShowFlag) {
+        var flag = _this.isYouzan() ? normalizeYouzanStar(value === null || value === void 0 ? void 0 : value.flag) : value === null || value === void 0 ? void 0 : value.flag;
+        if (!flag && flag !== 0) {
+          return Promise.reject(new Error(_this.isYouzan() ? '请选择星标' : '请选择旗帜'));
+        }
       }
       return Promise.resolve();
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "2.10.9-beta.25",
+  "version": "2.10.9-beta.27",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -21,8 +21,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "2.10.9-beta.25",
-    "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.25",
+    "@kmkf-fe-packages/basic-components": "2.10.9-beta.27",
+    "@kmkf-fe-packages/kmkf-utils": "2.10.9-beta.27",
     "b64-to-blob": "^1.2.19",
     "html2canvas": "^1.4.1",
     "react-pdf-js": "^5.1.0"
@@ -41,7 +41,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "94fca8997d4d3587ba91d4e9683ff2b1ab39bb3d",
+  "gitHead": "abb6f5b377be64bb78d0fc7a65cc0b75db6347fc",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }