@chaoswise/business 1.0.0 → 1.0.2

package/lib/PropertyControlViewer/components/DoUser.js

@@ -30,8 +30,8 @@ var DoUser = function DoUser(_ref) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", null, tooltipContent[key], " ", item[key] || '', ' '), /*#__PURE__*/React.createElement("br", null));
     });
   };
-  var nameKey = componentType === 'USER_GROUP' ? 'groupName' : 'userAlias';
-  return /*#__PURE__*/React.createElement(Fragment, null, belongComponentType === 'TABLE' ? /*#__PURE__*/React.createElement(TagShowMoreList, {
+  var nameKey = componentType === "USER_GROUP" ? 'groupName' : 'userAlias';
+  return /*#__PURE__*/React.createElement(Fragment, null, belongComponentType === "TABLE" ? /*#__PURE__*/React.createElement(TagShowMoreList, {
     text: list,
     tagCount: 1,
     flag: "user",
@@ -53,9 +53,9 @@ var DoUser = function DoUser(_ref) {
     }, /*#__PURE__*/React.createElement(_Avatar, {
       className: 'ci-detail-avatar',
       size: "small"
-    }, (_ref2 = item.userAlias || item.name) === null || _ref2 === void 0 ? void 0 : _ref2.substring(0, 1)), /*#__PURE__*/React.createElement("div", {
+    }, (_ref2 = item.userAlias ? "".concat(item.userName, "(").concat(item.userAlias, ")") : item.name) === null || _ref2 === void 0 ? void 0 : _ref2.substring(0, 1)), /*#__PURE__*/React.createElement("div", {
       className: 'ci-detail-user-name'
-    }, item.userAlias || item.name)));
+    }, item.userAlias ? "".concat(item.userName, "(").concat(item.userAlias, ")") : item.name)));
   })));
 };
 export default DoUser;

package/lib/PropertyControlViewer/components/TagShowMoreList/index.js

@@ -55,7 +55,12 @@ var TagShowMoreList = function TagShowMoreList(props) {
     var classNameDiv = _className || 'wrapper-inner';
     return tags.map(function (item, index) {
       var _String;
-      var _name = item[nameKey] || (item === null || item === void 0 ? void 0 : item.ciName) || (item === null || item === void 0 ? void 0 : item.id);
+      var _name = '';
+      if (nameKey == 'userAlias') {
+        _name = item.userAlias ? "".concat(item === null || item === void 0 ? void 0 : item.userName, "(").concat(item === null || item === void 0 ? void 0 : item.userAlias, ")") : item === null || item === void 0 ? void 0 : item.id;
+      } else {
+        _name = item[nameKey] || (item === null || item === void 0 ? void 0 : item.ciName) || (item === null || item === void 0 ? void 0 : item.id);
+      }
       return /*#__PURE__*/React.createElement(_Tooltip, {
         title: tooltipContentFuc ? tooltipContentFuc(item) : _name,
         key: index,

package/lib/PropertyControlViewer/index.js

@@ -1,15 +1,23 @@
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import _Tooltip from "@chaoswise/ui/lib/Tooltip";
 import _Form from "@chaoswise/ui/lib/Form";
 import _Collapse from "@chaoswise/ui/lib/Collapse";
-var _excluded = ["schemaData", "detailContent"],
-  _excluded2 = ["item", "detailContent"];
+var _excluded = ["schemaData", "detailContent", "filterAttrs"],
+  _excluded2 = ["properties", "attrID"],
+  _excluded3 = ["item", "detailContent"];
 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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+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(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import React, { useState, useEffect, useMemo, memo } from 'react';
 import { getDescriptionComp, getDataFunc, judgmentTypeFunc } from './config/utils';
 import { useIntl } from '../locales';
 import './index.less';
+import PropTypes from "prop-types";
 var Panel = _Collapse.Panel;
 var compositeAttr = {
   UNIT_RANGE: 1,
@@ -21,11 +29,33 @@ var setWidthClassName = {
 var PropertyControlViewer = function PropertyControlViewer(_ref) {
   var schemaData = _ref.schemaData,
     detailContent = _ref.detailContent,
+    filterAttrs = _ref.filterAttrs,
     rest = _objectWithoutProperties(_ref, _excluded);
   var intl = useIntl();
+  var _schemaData = useMemo(function () {
+    if (!filterAttrs || filterAttrs.length == 0) {
+      return schemaData;
+    }
+    var filteredData = schemaData.map(function (_ref2) {
+      var properties = _ref2.properties,
+        attrID = _ref2.attrID,
+        rest = _objectWithoutProperties(_ref2, _excluded2);
+      return _objectSpread(_objectSpread({}, rest), {}, {
+        attrID: attrID,
+        properties: properties.filter(function (property) {
+          return !filterAttrs.some(function (_ref3) {
+            var attrGroupId = _ref3.attrGroupId,
+              conditionAttrID = _ref3.attrID;
+            return attrID === attrGroupId && property.attrID === conditionAttrID;
+          });
+        })
+      });
+    });
+    return filteredData;
+  }, [schemaData]);
   var comList = useMemo(function () {
-    if (schemaData && schemaData.length > 0) {
-      return schemaData.map(function (i, index) {
+    if (_schemaData && _schemaData.length > 0) {
+      return _schemaData.map(function (i, index) {
         if (i.componentType === 'ATTRIBUTE_GROUP') {
           return /*#__PURE__*/React.createElement(_Collapse, {
             key: i.attrID,
@@ -71,7 +101,7 @@ var PropertyControlViewer = function PropertyControlViewer(_ref) {
     } else {
       return null;
     }
-  }, [schemaData]);
+  }, [_schemaData]);
   return /*#__PURE__*/React.createElement(_Form, {
     style: {
       minHeight: '100%'
@@ -81,11 +111,11 @@ var PropertyControlViewer = function PropertyControlViewer(_ref) {
     className: "form-properties-box form-properties-view-box"
   }, comList));
 };
-var AttrFormItem = /*#__PURE__*/memo(function (_ref2) {
+var AttrFormItem = /*#__PURE__*/memo(function (_ref4) {
   var _detailContent$conten;
-  var item = _ref2.item,
-    detailContent = _ref2.detailContent,
-    rest = _objectWithoutProperties(_ref2, _excluded2);
+  var item = _ref4.item,
+    detailContent = _ref4.detailContent,
+    rest = _objectWithoutProperties(_ref4, _excluded3);
   var attrID = item.attrID,
     attrName = item.attrName,
     componentType = item.componentType,
@@ -125,4 +155,41 @@ var AttrFormItem = /*#__PURE__*/memo(function (_ref2) {
     data: data
   })))));
 });
+PropertyControlViewer.propTypes = {
+  /**
+   * 模型属性数据
+   */
+  schemaData: PropTypes.array.isRequired,
+  /**
+   * 配置项数据
+   */
+  detailContent: PropTypes.object.isRequired,
+  /**
+   * 需要过滤隐藏的属性
+   */
+  filterAttrs: PropTypes.arrayOf(PropTypes.shape({
+    "attrGroupId": PropTypes.string,
+    "attrID": PropTypes.string
+  })),
+  /**
+   * 属性类型为input和textarea自动溢出省略，为对象时可设置省略行数与是否可展开等 
+   */
+  paragraphEllipsis: PropTypes.oneOf([PropTypes["boolean"], PropTypes.object]),
+  /**
+   * 属性类型为select和checkbox, 可设置显示的数量
+   */
+  tagCount: PropTypes.number,
+  /**
+   * 属性类型为quote的点击事件
+   */
+  handleClickChange: PropTypes.func,
+  /**
+   * 属性类型为user，鼠标悬浮显示的tooltip字段
+   */
+  userTooltipContent: PropTypes.object,
+  /**
+   * 属性类型为userGroup, 鼠标悬浮显示的tooltip字段
+   */
+  userGroupTooltipContent: PropTypes.object
+};
 export default PropertyControlViewer;

package/lib/PropertyControlViewer/index.less

@@ -23,6 +23,7 @@
   }
 
   .view_table {
+    margin-bottom: 24px;
     .@{ant-prefix}-form-item-control-wrapper {
       width: calc(100% - 110px);
     }

package/lib/index.js

@@ -1,3 +1,4 @@
 export { default as PropertyControlViewer } from "./PropertyControlViewer";
 export { default as AggregateSearch } from "./AggregateSearch";
-export { default as Watermark } from "./Watermark";
+export { default as Watermark } from "./Watermark";
+export { default as ContentEditableSearch } from "./ContentEditableSearch";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chaoswise/business",
   "packageName": "chaoswiseBusiness",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "业务组件库",
   "keywords": [
     "ui",
@@ -111,5 +111,6 @@
   "publishConfig": {
     "access": "public"
   },
-  "license": "MIT"
+  "license": "MIT",
+  "gitHead": "3afd9f5a5ef3366719650108213fc011128ce303"
 }