linkmore-design 1.1.11 → 1.1.13

package/lib/Select/index.js

@@ -38,13 +38,49 @@ var CLMSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
       className = props.className,
       customizeSize = props.size,
       dropdownClassName = props.dropdownClassName,
-      others = __rest(props, ["children", "className", "size", "dropdownClassName"]);
+      options = props.options,
+      value = props.value,
+      defaultLabel = props.defaultLabel,
+      others = __rest(props, ["children", "className", "size", "dropdownClassName", "options", "value", "defaultLabel"]);
 
-  var size = customizeSize || _react.default.useContext(_SizeContext.default) || 'middle';
+  var size = customizeSize || _react.default.useContext(_SizeContext.default) || 'middle'; // 当前值是否存于选项中
+
+  var hasOption = (0, _react.useMemo)(function () {
+    var flag = false;
+
+    if (children) {
+      _react.default.Children.forEach(children, function (child) {
+        if ( /*#__PURE__*/_react.default.isValidElement(child)) {
+          var childValue = child.props.value;
+
+          if (!flag) {
+            flag = childValue === value;
+          }
+        }
+      });
+    }
+
+    if (options) {
+      flag = !!options.some(function (v) {
+        var _a, _b;
+
+        return v[(_b = (_a = props.fieldNames) === null || _a === void 0 ? void 0 : _a.value) !== null && _b !== void 0 ? _b : 'value'] === value;
+      });
+    }
+
+    return flag;
+  }, [children, value, options, props.fieldNames]); // 重组value: 传入value但找不到options项时，展示默认label
+
+  var resetValue = (0, _react.useMemo)(function () {
+    if (value && !hasOption) return defaultLabel !== null && defaultLabel !== void 0 ? defaultLabel : value;
+    return value;
+  }, [value, defaultLabel, hasOption]);
   return /*#__PURE__*/_react.default.createElement(_select.default, Object.assign({
     className: (0, _classnames.default)(className, prefixCls),
     size: size,
-    ref: ref
+    ref: ref,
+    value: resetValue,
+    options: options
   }, others, {
     dropdownClassName: (0, _classnames.default)('lm_select_dropdown', dropdownClassName)
   }), children);

package/lib/TreeSelect/index.d.ts

@@ -1,3 +1,8 @@
-import { TreeSelect } from 'antd';
-export type { TreeSelectProps } from 'antd';
-export default TreeSelect;
+import { TreeSelect, TreeSelectProps as OriginTreeSelectProps } from 'antd';
+export interface TreeSelectProps extends OriginTreeSelectProps {
+    defaultLabel?: string;
+    children?: any;
+}
+declare type TreeSelectType = typeof TreeSelect & typeof TreeSelect.TreeNode;
+declare const LMTreeSelect: TreeSelectType;
+export default LMTreeSelect;

package/lib/TreeSelect/index.js

@@ -1,5 +1,7 @@
 "use strict";
 
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
+
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 
 Object.defineProperty(exports, "__esModule", {
@@ -11,5 +13,80 @@ require("antd/es/tree-select/style");
 
 var _treeSelect = _interopRequireDefault(require("antd/es/tree-select"));
 
-var _default = _treeSelect.default;
+var _react = _interopRequireWildcard(require("react"));
+
+var __rest = void 0 && (void 0).__rest || function (s, e) {
+  var t = {};
+
+  for (var p in s) {
+    if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+  }
+
+  if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+    if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+  }
+  return t;
+};
+
+var CLMTreeSelect = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
+  var children = props.children,
+      treeData = props.treeData,
+      value = props.value,
+      defaultLabel = props.defaultLabel,
+      resetProps = __rest(props, ["children", "treeData", "value", "defaultLabel"]);
+
+  var deepChildren = (0, _react.useCallback)(function (arr) {
+    var flag = false;
+
+    _react.default.Children.forEach(arr, function (child) {
+      if ( /*#__PURE__*/_react.default.isValidElement(child)) {
+        var _child$props = child.props,
+            childValue = _child$props.value,
+            childChildren = _child$props.children;
+
+        if (!flag) {
+          if (childValue === value) {
+            flag = true;
+          } else if (childChildren) {
+            flag = deepChildren(childChildren);
+          }
+        }
+      }
+    });
+
+    return flag;
+  }, [value]);
+  var hasOption = (0, _react.useMemo)(function () {
+    var flag = false;
+
+    if (children) {
+      flag = deepChildren(children);
+    }
+
+    if (treeData) {
+      var deepFind = function deepFind(arr) {
+        return arr.some(function (v) {
+          if (v.value === value) return true;
+          return v.children && deepFind(v.children);
+        });
+      };
+
+      flag = deepFind(treeData);
+    }
+
+    return flag;
+  }, [children, value, deepChildren]); // 重组value: 传入value但找不到options项时，展示默认label
+
+  var resetValue = (0, _react.useMemo)(function () {
+    if (value && !hasOption) return defaultLabel !== null && defaultLabel !== void 0 ? defaultLabel : value;
+    return value;
+  }, [value, hasOption]);
+  return /*#__PURE__*/_react.default.createElement(_treeSelect.default, Object.assign({
+    ref: ref,
+    value: resetValue
+  }, resetProps), children);
+});
+var LMTreeSelect = CLMTreeSelect;
+LMTreeSelect.TreeNode = _treeSelect.default.TreeNode;
+var _default = LMTreeSelect;
 exports.default = _default;

package/lib/styles/variables.css

@@ -9802,6 +9802,24 @@ p {
   color: var(--color-85);
   margin-left: 0 !important;
 }
+.lm_table_append_add_popover .ant-popover-inner-content {
+  padding: 0px;
+}
+.lm_table_append_add_popover .ant-popover-inner-content ul {
+  margin: 0;
+}
+.lm_table_append_add_popover .ant-popover-inner-content ul li {
+  font-size: 12px;
+  padding: 4px 8px;
+  height: 24px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+}
+.lm_table_append_add_popover .ant-popover-inner-content ul li:hover {
+  background-color: var(--color-15);
+}
 .lm_filter_wrapper .lm_filter_container .lm_filter {
   display: flex;
   flex-wrap: wrap;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "linkmore-design",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "author": {
     "name": "nowthen",
     "email": "rnlvwyx@gmail.com"