@kmkf-fe-packages/services-components 1.0.3-alpha.1 → 1.0.3-alpha.10

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

@@ -19,9 +19,10 @@ declare class Label implements ComponentInterface {
     getComponentValue: (r: Record) => any;
     editRender: (p: any) => React.JSX.Element;
     renderClient: (record: any) => React.JSX.Element | null;
+    showDetail: (value: Array<string>) => React.JSX.Element;
     renderPc: (value: any, record: Record) => React.JSX.Element;
-    renderLog: (r: Record) => null;
-    renderExport: (value: any, record: Record) => string;
+    renderLog: (r: Record) => React.JSX.Element;
+    renderExport: (value: any, record: Record) => any;
     filterConfig: (item: ColumnConfig) => never[];
 }
 export default Label;

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

@@ -7,30 +7,34 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 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); }
 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); }
 import React from "react";
-import { Tag, Select } from 'antd';
+import { Tag, Select, Space } from 'antd';
 import { LabelData, isNull } from "@kmkf-fe-packages/kmkf-utils";
 import GetFormItem from "../GetFormItem";
 import ItemView from "../../commonComponents/ItemView";
-var tagRender = function tagRender(props) {
-  var label = props.label,
-    closable = props.closable,
-    onClose = props.onClose,
-    color = props.color;
-  var onPreventMouseDown = function onPreventMouseDown(event) {
-    event.preventDefault();
-    event.stopPropagation();
-  };
-  return /*#__PURE__*/React.createElement(Tag, {
-    color: color,
-    onMouseDown: onPreventMouseDown,
-    closable: closable,
-    onClose: onClose,
-    style: {
-      marginRight: 3
-    }
-  }, label);
-};
 var EditRenderItem = function EditRenderItem(props) {
+  var tagRender = function tagRender(prop) {
+    var _props$options, _props$options$find;
+    var label = prop.label,
+      closable = prop.closable,
+      onClose = prop.onClose,
+      value = prop.value;
+    var color = props === null || props === void 0 ? void 0 : (_props$options = props.options) === null || _props$options === void 0 ? void 0 : (_props$options$find = _props$options.find(function (item) {
+      return item.value === value;
+    })) === null || _props$options$find === void 0 ? void 0 : _props$options$find.color;
+    var onPreventMouseDown = function onPreventMouseDown(event) {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+    return /*#__PURE__*/React.createElement(Tag, {
+      color: color,
+      onMouseDown: onPreventMouseDown,
+      closable: closable,
+      onClose: onClose,
+      style: {
+        marginRight: 3
+      }
+    }, label);
+  };
   return /*#__PURE__*/React.createElement(Select, _extends({}, props, {
     mode: "multiple",
     showArrow: true,
@@ -55,7 +59,7 @@ var Label = /*#__PURE__*/_createClass(function Label(options) {
   _defineProperty(this, "options", void 0);
   _defineProperty(this, "labelDateInstance", void 0);
   _defineProperty(this, "getComponentValue", function (r) {
-    return r === null || r === void 0 ? void 0 : r["".concat(_this.id)];
+    return r === null || r === void 0 ? void 0 : r["".concat(_this.id, "_label")];
   });
   _defineProperty(this, "editRender", function (p) {
     var _this$componentConfig, _this$componentConfig2;
@@ -76,25 +80,40 @@ var Label = /*#__PURE__*/_createClass(function Label(options) {
     });
   });
   _defineProperty(this, "renderClient", function (record) {
+    console.debug('renderClient', record);
     return !isNull(record === null || record === void 0 ? void 0 : record[_this.id]) ? /*#__PURE__*/React.createElement(ItemView, {
       id: _this.id,
       label: _this.name,
-      value: _this.renderPc(undefined, record)
+      value: _this.showDetail(record === null || record === void 0 ? void 0 : record["".concat(_this.id)])
     }) : null;
   });
-  _defineProperty(this, "renderPc", function (value, record) {
-    var _record;
-    return /*#__PURE__*/React.createElement("span", null, Array.isArray(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_label")]) ? record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id, "_label")]) === null || _record === void 0 ? void 0 : _record.map(function (item) {
-      return /*#__PURE__*/React.createElement(Tag, {
-        color: item.color
-      }, item.label);
+  _defineProperty(this, "showDetail", function (value) {
+    return /*#__PURE__*/React.createElement(Space, {
+      style: {
+        flexWrap: 'wrap'
+      }
+    }, Array.isArray(value) ? value === null || value === void 0 ? void 0 : value.map(function (v) {
+      var _this$labelDateInstan;
+      var label = ((_this$labelDateInstan = _this.labelDateInstance.labelData) === null || _this$labelDateInstan === void 0 ? void 0 : _this$labelDateInstan.find(function (item) {
+        return item.value === v;
+      })) || {};
+      if (!isNull(label)) return /*#__PURE__*/React.createElement(Tag, {
+        color: label === null || label === void 0 ? void 0 : label.color
+      }, label === null || label === void 0 ? void 0 : label.label);
+      return null;
     }) : "--");
   });
+  _defineProperty(this, "renderPc", function (value, record) {
+    return _this.showDetail(record === null || record === void 0 ? void 0 : record["".concat(_this.id, "_label")]);
+  });
   _defineProperty(this, "renderLog", function (r) {
-    return null;
+    console.debug('renderLog', r);
+    return _this.renderPc(undefined, r);
   });
   _defineProperty(this, "renderExport", function (value, record) {
-    return '--';
+    var _record;
+    console.debug('renderExport', record);
+    return record === null || record === void 0 ? void 0 : (_record = record["".concat(_this.id, "_label")]) === null || _record === void 0 ? void 0 : _record.join('、');
   });
   _defineProperty(this, "filterConfig", function (item) {
     return [];
@@ -111,6 +130,6 @@ var Label = /*#__PURE__*/_createClass(function Label(options) {
   this.children = [];
   this.dataType = "array";
   this.options = ((_this$componentConfig3 = this.componentConfig) === null || _this$componentConfig3 === void 0 ? void 0 : _this$componentConfig3.options) || [];
-  this.labelDateInstance = new LabelData();
+  this.labelDateInstance = LabelData.getInstance();
 });
 export default Label;

package/dist/esm/service/api.js

@@ -266,6 +266,12 @@ export var queryLabel = function queryLabel() {
   }).then(function (res) {
     var data = res.data;
     var instance = LabelData.getInstance();
-    instance.labelData = data;
+    try {
+      var finalData = JSON.parse(data);
+      instance.labelData = finalData;
+    } catch (e) {
+      console.error('转换标签数据数据异常');
+      instance.labelData = [];
+    }
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kmkf-fe-packages/services-components",
-  "version": "1.0.3-alpha.1",
+  "version": "1.0.3-alpha.10",
   "module": "dist/esm/index.js",
   "typings": "dist/esm/index.d.ts",
   "files": [
@@ -20,8 +20,8 @@
     ]
   },
   "dependencies": {
-    "@kmkf-fe-packages/basic-components": "^1.0.3-alpha.0",
-    "@kmkf-fe-packages/kmkf-utils": "^1.0.3-alpha.0"
+    "@kmkf-fe-packages/basic-components": "^1.0.3-alpha.10",
+    "@kmkf-fe-packages/kmkf-utils": "^1.0.3-alpha.10"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.59.2",
@@ -37,7 +37,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3714facd974aedc0ffc02d9af96b9662dd410ab4",
+  "gitHead": "6537c714bd1ebb87ce25990714fbd52800c9e5a1",
   "gitHooks": {
     "pre-commit": "lint-staged"
   }