assui 3.1.67 → 3.1.69

package/es/complex-val-select/index.d.ts

@@ -0,0 +1,11 @@
+import * as React from 'react';
+import type { SelectProps } from 'antd/lib/select';
+declare const Option: import("rc-select/lib/Option").OptionFC;
+export { Option };
+export declare type ValueType = string | number | any[] | Record<string, any> | null | undefined;
+export interface ComplexValSelectProps<T> extends Omit<SelectProps, 'value' | 'onChange'> {
+    value?: T;
+    onChange?: (val: T, opt: SelectProps['options']) => void;
+}
+declare const ComplexValSelect: React.ForwardRefExoticComponent<ComplexValSelectProps<ValueType> & React.RefAttributes<unknown>>;
+export default ComplexValSelect;

package/es/complex-val-select/index.js

@@ -0,0 +1,90 @@
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
+      ar.push(r.value);
+    }
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+import * as React from 'react';
+import omit from 'lodash/omit';
+import find from 'lodash/find';
+import some from 'lodash/some';
+import isArray from 'lodash/isArray';
+import isObject from 'lodash/isObject';
+import Select from "antd/es/select";
+import useControllableValue from "ahooks/es/useControllableValue";
+var Option = Select.Option;
+export { Option };
+var ComplexValSelect = /*#__PURE__*/React.forwardRef(function (props, ref) {
+  var _a = __read(useControllableValue(props), 2),
+    value = _a[0],
+    setValue = _a[1];
+  var options = props.options,
+    onChange = props.onChange,
+    onSelect = props.onSelect;
+  var selectRef = React.useRef(null);
+  React.useImperativeHandle(ref, function () {
+    return selectRef.current;
+  });
+  // 判断是否需要将optionValue转为JSON字符串
+  var isReferenceTypeVal = some(options, function (item) {
+    return isArray(item.value) || isObject(item.value);
+  });
+  var finalOptions = isReferenceTypeVal ? options === null || options === void 0 ? void 0 : options.map(function (item) {
+    return __assign(__assign({}, item), {
+      value: JSON.stringify(item.value)
+    });
+  }) : options;
+  var handleChange = function handleChange(val) {
+    var nextVal = isReferenceTypeVal ? JSON.parse(val) : val;
+    setValue(nextVal);
+    onChange === null || onChange === void 0 ? void 0 : onChange(nextVal, options);
+  };
+  var handleSelect = function handleSelect(val) {
+    var nextVal = isReferenceTypeVal ? JSON.parse(val) : val;
+    var selectOption = find(finalOptions, {
+      value: val
+    });
+    onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextVal, {
+      label: selectOption.label,
+      value: nextVal
+    });
+  };
+  return /*#__PURE__*/React.createElement(Select, __assign({
+    ref: selectRef,
+    value: isReferenceTypeVal ? JSON.stringify(value) : value,
+    options: finalOptions,
+    onChange: handleChange,
+    onSelect: handleSelect
+  }, omit(props, ['value', 'onChange', 'options', 'onSelect'])));
+});
+export default ComplexValSelect;

package/es/complex-val-select/style/index.d.ts

@@ -0,0 +1 @@
+import 'antd/lib/select/style';

package/es/complex-val-select/style/index.js

@@ -0,0 +1 @@
+import "antd/es/select/style";

package/es/condition-select-input/index.js

@@ -37,7 +37,7 @@ var __read = this && this.__read || function (o, n) {
 import isNil from 'lodash/isNil';
 import isEmpty from 'lodash/isEmpty';
 import classNames from 'classnames';
-import Select from "antd/es/select";
+import ComplexValSelect from '../complex-val-select';
 import React, { useEffect, useState } from 'react';
 import useControllableValue from "ahooks/es/useControllableValue";
 import ConditionInput from '../condition-input';
@@ -170,7 +170,7 @@ var ConditionSelectInput = function ConditionSelectInput(props) {
     }
   }))) : /*#__PURE__*/React.createElement("div", {
     className: "condition-select-select-input"
-  }, /*#__PURE__*/React.createElement(Select, __assign({}, conditionSelectProps, {
+  }, /*#__PURE__*/React.createElement(ComplexValSelect, __assign({}, conditionSelectProps, {
     onChange: onTypeSelectChange,
     value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.inputValue,
     options: subSelectOptions,
@@ -186,7 +186,7 @@ var ConditionSelectInput = function ConditionSelectInput(props) {
       'condition-two-select-selecter': !isInput,
       'condition-only-selecter': !isShowInput
     })
-  }, /*#__PURE__*/React.createElement(Select, __assign({}, selectProps, {
+  }, /*#__PURE__*/React.createElement(ComplexValSelect, __assign({}, selectProps, {
     onChange: onSelectChange,
     value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.selectValue,
     options: optionsList,

package/es/index.d.ts

@@ -82,3 +82,5 @@ export type { LabelConditionSelectInputProps } from './label-condition-select-in
 export { default as LabelConditionSelectInput } from './label-condition-select-input';
 export type { MultipartUploadProps } from './multipart-upload';
 export { default as MultipartUpload } from './multipart-upload';
+export type { ComplexValSelectProps } from './complex-val-select';
+export { default as ComplexValSelect } from './complex-val-select';

package/es/index.js

@@ -41,4 +41,5 @@ export { default as BeautifulDnd } from './beautiful-dnd';
 export { default as Resizable } from './resizable';
 export { default as Flex } from './flex';
 export { default as LabelConditionSelectInput } from './label-condition-select-input';
-export { default as MultipartUpload } from './multipart-upload';
+export { default as MultipartUpload } from './multipart-upload';
+export { default as ComplexValSelect } from './complex-val-select';

package/es/label-select/index.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
 import type { SelectProps } from 'antd/lib/select';
+import type { ComplexValSelectProps } from '../complex-val-select';
 declare const Option: import("rc-select/lib/Option").OptionFC;
 export { Option };
-export interface LabelSelectProps extends SelectProps {
+export interface LabelSelectProps extends ComplexValSelectProps<any> {
     label?: React.ReactNode;
     onBlur?: (value: SelectProps['value']) => void;
 }

package/es/label-select/index.js

@@ -37,6 +37,7 @@ var __read = this && this.__read || function (o, n) {
 import React from 'react';
 import useControllableValue from "ahooks/es/useControllableValue";
 import Select from "antd/es/select";
+import ComplexValSelect from '../complex-val-select';
 import isArray from 'lodash/isArray';
 import isUndefined from 'lodash/isUndefined';
 import isNull from 'lodash/isNull';
@@ -82,7 +83,7 @@ var LabelSelect = function LabelSelect(props, ref) {
       'label-select': true,
       'label-select-label-scale': open || !isArray(value) && !isUndefined(value) && !isNull(value) || isArray(value) && value.length
     }, className)
-  }, /*#__PURE__*/React.createElement(Select, __assign({
+  }, /*#__PURE__*/React.createElement(ComplexValSelect, __assign({
     maxTagCount: 3,
     showSearch: false
   }, omit(props, ['open', 'onChange', 'className', 'label', 'setOpen', 'isFocus']), {
@@ -103,6 +104,5 @@ var LabelSelect = function LabelSelect(props, ref) {
     onClick: handleLabelClick
   }, label));
 };
-// export default LabelSelect;
 var ForwardRefLabelSelect = /*#__PURE__*/React.forwardRef(LabelSelect);
 export default ForwardRefLabelSelect;

package/lib/complex-val-select/index.d.ts

@@ -0,0 +1,11 @@
+import * as React from 'react';
+import type { SelectProps } from 'antd/lib/select';
+declare const Option: import("rc-select/lib/Option").OptionFC;
+export { Option };
+export declare type ValueType = string | number | any[] | Record<string, any> | null | undefined;
+export interface ComplexValSelectProps<T> extends Omit<SelectProps, 'value' | 'onChange'> {
+    value?: T;
+    onChange?: (val: T, opt: SelectProps['options']) => void;
+}
+declare const ComplexValSelect: React.ForwardRefExoticComponent<ComplexValSelectProps<ValueType> & React.RefAttributes<unknown>>;
+export default ComplexValSelect;

package/lib/complex-val-select/index.js

@@ -0,0 +1,134 @@
+"use strict";
+
+var __assign = this && this.__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
+var __createBinding = this && this.__createBinding || (Object.create ? function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  var desc = Object.getOwnPropertyDescriptor(m, k);
+  if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+    desc = {
+      enumerable: true,
+      get: function get() {
+        return m[k];
+      }
+    };
+  }
+  Object.defineProperty(o, k2, desc);
+} : function (o, m, k, k2) {
+  if (k2 === undefined) k2 = k;
+  o[k2] = m[k];
+});
+var __setModuleDefault = this && this.__setModuleDefault || (Object.create ? function (o, v) {
+  Object.defineProperty(o, "default", {
+    enumerable: true,
+    value: v
+  });
+} : function (o, v) {
+  o["default"] = v;
+});
+var __importStar = this && this.__importStar || function (mod) {
+  if (mod && mod.__esModule) return mod;
+  var result = {};
+  if (mod != null) for (var k in mod) {
+    if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+  }
+  __setModuleDefault(result, mod);
+  return result;
+};
+var __read = this && this.__read || function (o, n) {
+  var m = typeof Symbol === "function" && o[Symbol.iterator];
+  if (!m) return o;
+  var i = m.call(o),
+    r,
+    ar = [],
+    e;
+  try {
+    while ((n === void 0 || n-- > 0) && !(r = i.next()).done) {
+      ar.push(r.value);
+    }
+  } catch (error) {
+    e = {
+      error: error
+    };
+  } finally {
+    try {
+      if (r && !r.done && (m = i["return"])) m.call(i);
+    } finally {
+      if (e) throw e.error;
+    }
+  }
+  return ar;
+};
+var __importDefault = this && this.__importDefault || function (mod) {
+  return mod && mod.__esModule ? mod : {
+    "default": mod
+  };
+};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.Option = void 0;
+var React = __importStar(require("react"));
+var omit_1 = __importDefault(require("lodash/omit"));
+var find_1 = __importDefault(require("lodash/find"));
+var some_1 = __importDefault(require("lodash/some"));
+var isArray_1 = __importDefault(require("lodash/isArray"));
+var isObject_1 = __importDefault(require("lodash/isObject"));
+var select_1 = __importDefault(require("antd/lib/select"));
+var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
+var Option = select_1["default"].Option;
+exports.Option = Option;
+var ComplexValSelect = React.forwardRef(function (props, ref) {
+  var _a = __read((0, useControllableValue_1["default"])(props), 2),
+    value = _a[0],
+    setValue = _a[1];
+  var options = props.options,
+    onChange = props.onChange,
+    onSelect = props.onSelect;
+  var selectRef = React.useRef(null);
+  React.useImperativeHandle(ref, function () {
+    return selectRef.current;
+  });
+  // 判断是否需要将optionValue转为JSON字符串
+  var isReferenceTypeVal = (0, some_1["default"])(options, function (item) {
+    return (0, isArray_1["default"])(item.value) || (0, isObject_1["default"])(item.value);
+  });
+  var finalOptions = isReferenceTypeVal ? options === null || options === void 0 ? void 0 : options.map(function (item) {
+    return __assign(__assign({}, item), {
+      value: JSON.stringify(item.value)
+    });
+  }) : options;
+  var handleChange = function handleChange(val) {
+    var nextVal = isReferenceTypeVal ? JSON.parse(val) : val;
+    setValue(nextVal);
+    onChange === null || onChange === void 0 ? void 0 : onChange(nextVal, options);
+  };
+  var handleSelect = function handleSelect(val) {
+    var nextVal = isReferenceTypeVal ? JSON.parse(val) : val;
+    var selectOption = (0, find_1["default"])(finalOptions, {
+      value: val
+    });
+    onSelect === null || onSelect === void 0 ? void 0 : onSelect(nextVal, {
+      label: selectOption.label,
+      value: nextVal
+    });
+  };
+  return React.createElement(select_1["default"], __assign({
+    ref: selectRef,
+    value: isReferenceTypeVal ? JSON.stringify(value) : value,
+    options: finalOptions,
+    onChange: handleChange,
+    onSelect: handleSelect
+  }, (0, omit_1["default"])(props, ['value', 'onChange', 'options', 'onSelect'])));
+});
+exports["default"] = ComplexValSelect;

package/lib/complex-val-select/style/index.d.ts

@@ -0,0 +1 @@
+import 'antd/lib/select/style';

package/lib/complex-val-select/style/index.js

@@ -0,0 +1,6 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+require("antd/lib/select/style");

package/lib/condition-select-input/index.js

@@ -81,7 +81,7 @@ exports.EntryTypeEnum = exports.InputTypeEnum = void 0;
 var isNil_1 = __importDefault(require("lodash/isNil"));
 var isEmpty_1 = __importDefault(require("lodash/isEmpty"));
 var classnames_1 = __importDefault(require("classnames"));
-var select_1 = __importDefault(require("antd/lib/select"));
+var complex_val_select_1 = __importDefault(require("../complex-val-select"));
 var react_1 = __importStar(require("react"));
 var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
 var condition_input_1 = __importDefault(require("../condition-input"));
@@ -214,7 +214,7 @@ var ConditionSelectInput = function ConditionSelectInput(props) {
     }
   }))) : react_1["default"].createElement("div", {
     className: "condition-select-select-input"
-  }, react_1["default"].createElement(select_1["default"], __assign({}, conditionSelectProps, {
+  }, react_1["default"].createElement(complex_val_select_1["default"], __assign({}, conditionSelectProps, {
     onChange: onTypeSelectChange,
     value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.inputValue,
     options: subSelectOptions,
@@ -230,7 +230,7 @@ var ConditionSelectInput = function ConditionSelectInput(props) {
       'condition-two-select-selecter': !isInput,
       'condition-only-selecter': !isShowInput
     })
-  }, react_1["default"].createElement(select_1["default"], __assign({}, selectProps, {
+  }, react_1["default"].createElement(complex_val_select_1["default"], __assign({}, selectProps, {
     onChange: onSelectChange,
     value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.selectValue,
     options: optionsList,

package/lib/index.d.ts

@@ -82,3 +82,5 @@ export type { LabelConditionSelectInputProps } from './label-condition-select-in
 export { default as LabelConditionSelectInput } from './label-condition-select-input';
 export type { MultipartUploadProps } from './multipart-upload';
 export { default as MultipartUpload } from './multipart-upload';
+export type { ComplexValSelectProps } from './complex-val-select';
+export { default as ComplexValSelect } from './complex-val-select';

package/lib/index.js

@@ -8,7 +8,7 @@ var __importDefault = this && this.__importDefault || function (mod) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.MultipartUpload = exports.LabelConditionSelectInput = exports.Flex = exports.Resizable = exports.BeautifulDnd = exports.RichTextEditor = exports.LabelCustomizeRangePicker = exports.TableCol = exports.LabelTreeSelect = exports.LabelConditionInput = exports.LabelNumberInput = exports.LabelAutoComplete = exports.LabelDatePicker = exports.LabelRangePicker = exports.JsonEditor = exports.AreaText = exports.LabelTextArea = exports.ASelect = exports.LabelSelect = exports.ColorSelect = exports.LabelInput = exports.TextInput = exports.TextArea = exports.SplitPane = exports.sortableHoc = exports.SingleImgUpload = exports.RcTransitionGroup = exports.RcQRcode = exports.RcEcharts = exports.StepNumberInput = exports.LabelRangeNumber = exports.NumberInput = exports.RcMotion = exports.KeepTab = exports.ImgCrop = exports.HighlightWords = exports.HighlightTextarea = exports.CopyToClipboard = exports.NumberFormatInput = exports.ConfigProvider = exports.ConditionSelectInput = exports.ConditionInput = exports.ButtonModal = exports.ButtonDrawer = void 0;
+exports.ComplexValSelect = exports.MultipartUpload = exports.LabelConditionSelectInput = exports.Flex = exports.Resizable = exports.BeautifulDnd = exports.RichTextEditor = exports.LabelCustomizeRangePicker = exports.TableCol = exports.LabelTreeSelect = exports.LabelConditionInput = exports.LabelNumberInput = exports.LabelAutoComplete = exports.LabelDatePicker = exports.LabelRangePicker = exports.JsonEditor = exports.AreaText = exports.LabelTextArea = exports.ASelect = exports.LabelSelect = exports.ColorSelect = exports.LabelInput = exports.TextInput = exports.TextArea = exports.SplitPane = exports.sortableHoc = exports.SingleImgUpload = exports.RcTransitionGroup = exports.RcQRcode = exports.RcEcharts = exports.StepNumberInput = exports.LabelRangeNumber = exports.NumberInput = exports.RcMotion = exports.KeepTab = exports.ImgCrop = exports.HighlightWords = exports.HighlightTextarea = exports.CopyToClipboard = exports.NumberFormatInput = exports.ConfigProvider = exports.ConditionSelectInput = exports.ConditionInput = exports.ButtonModal = exports.ButtonDrawer = void 0;
 var button_drawer_1 = require("./button-drawer");
 Object.defineProperty(exports, "ButtonDrawer", {
   enumerable: true,
@@ -316,4 +316,11 @@ Object.defineProperty(exports, "MultipartUpload", {
   get: function get() {
     return __importDefault(multipart_upload_1)["default"];
   }
+});
+var complex_val_select_1 = require("./complex-val-select");
+Object.defineProperty(exports, "ComplexValSelect", {
+  enumerable: true,
+  get: function get() {
+    return __importDefault(complex_val_select_1)["default"];
+  }
 });

package/lib/label-select/index.d.ts

@@ -1,8 +1,9 @@
 import React from 'react';
 import type { SelectProps } from 'antd/lib/select';
+import type { ComplexValSelectProps } from '../complex-val-select';
 declare const Option: import("rc-select/lib/Option").OptionFC;
 export { Option };
-export interface LabelSelectProps extends SelectProps {
+export interface LabelSelectProps extends ComplexValSelectProps<any> {
     label?: React.ReactNode;
     onBlur?: (value: SelectProps['value']) => void;
 }

package/lib/label-select/index.js

@@ -48,6 +48,7 @@ exports.Option = void 0;
 var react_1 = __importDefault(require("react"));
 var useControllableValue_1 = __importDefault(require("ahooks/lib/useControllableValue"));
 var select_1 = __importDefault(require("antd/lib/select"));
+var complex_val_select_1 = __importDefault(require("../complex-val-select"));
 var isArray_1 = __importDefault(require("lodash/isArray"));
 var isUndefined_1 = __importDefault(require("lodash/isUndefined"));
 var isNull_1 = __importDefault(require("lodash/isNull"));
@@ -93,7 +94,7 @@ var LabelSelect = function LabelSelect(props, ref) {
       'label-select': true,
       'label-select-label-scale': open || !(0, isArray_1["default"])(value) && !(0, isUndefined_1["default"])(value) && !(0, isNull_1["default"])(value) || (0, isArray_1["default"])(value) && value.length
     }, className)
-  }, react_1["default"].createElement(select_1["default"], __assign({
+  }, react_1["default"].createElement(complex_val_select_1["default"], __assign({
     maxTagCount: 3,
     showSearch: false
   }, (0, omit_1["default"])(props, ['open', 'onChange', 'className', 'label', 'setOpen', 'isFocus']), {
@@ -114,6 +115,5 @@ var LabelSelect = function LabelSelect(props, ref) {
     onClick: handleLabelClick
   }, label));
 };
-// export default LabelSelect;
 var ForwardRefLabelSelect = react_1["default"].forwardRef(LabelSelect);
 exports["default"] = ForwardRefLabelSelect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "3.1.67",
+  "version": "3.1.69",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -80,5 +80,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "021c35adaba09ce2abe3c75e7637f2cd20591a39"
+  "gitHead": "7093234ad09208aa396990803c7dcc52514eeda8"
 }