assui 3.1.58 → 3.1.60

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

@@ -147,20 +147,24 @@ var LabelConditionSelectInput = function LabelConditionSelectInput(props) {
       changedEntryType: blurEntryType
     }));
   };
-  /** 二级下拉框清空 */
-  var onTypeSelectClear = function onTypeSelectClear() {
-    var finalSelectInputValue = {
-      selectValue: selectInputValue.selectValue,
-      inputValue: [],
-      changedEntryType: EntryTypeEnum.SECOND_ENTRY
-    };
-    if (isSubSelectMultiple) {
-      finalSelectInputValue = __assign(__assign({}, finalSelectInputValue), {
-        finalSelectValue: findAllSubSelectItems(optionsList, selectInputValue.selectValue)
-      });
-    }
-    onBlur === null || onBlur === void 0 ? void 0 : onBlur(finalSelectInputValue);
-  };
+  // /** 二级下拉框清空 */
+  // const onTypeSelectClear = () => {
+  //   let finalSelectInputValue: ValueType = {
+  //     selectValue: selectInputValue.selectValue,
+  //     inputValue: [],
+  //     changedEntryType: EntryTypeEnum.SECOND_ENTRY,
+  //   };
+  //   if (isSubSelectMultiple) {
+  //     finalSelectInputValue = {
+  //       ...finalSelectInputValue,
+  //       finalSelectValue: findAllSubSelectItems(
+  //         optionsList,
+  //         selectInputValue.selectValue,
+  //       ),
+  //     };
+  //   }
+  //   onBlur?.(finalSelectInputValue);
+  // };
   // 是否展示输入框
   var isShowInput = !isNil(selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.selectValue) && !(hiddenInputKeys === null || hiddenInputKeys === void 0 ? void 0 : hiddenInputKeys.includes(selectInputValue.selectValue));
   var typeInput = isInput ? /*#__PURE__*/React.createElement(LabelConditionInput, __assign({}, conditionInputProps, {
@@ -177,10 +181,13 @@ var LabelConditionSelectInput = function LabelConditionSelectInput(props) {
     onChange: onTypeSelectChange,
     value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.inputValue,
     options: subSelectOptions,
+    onDeselect: function onDeselect() {
+      var _a;
+      (_a = subSelectRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    },
     onBlur: function onBlur() {
       return onLabelConditionSelectInputBlur(EntryTypeEnum.SECOND_ENTRY);
-    },
-    onClear: onTypeSelectClear
+    }
   })));
   return /*#__PURE__*/React.createElement("div", {
     className: classNames('label-condition-select', className)

package/es/label-select/index.js

@@ -92,6 +92,10 @@ var LabelSelect = function LabelSelect(props, ref) {
     className: "label-select-selector",
     onChange: handleChange,
     onBlur: handleBlur,
+    onDeselect: function onDeselect() {
+      var _a;
+      (_a = selectRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    },
     onDropdownVisibleChange: onDropdownVisibleChange,
     suffixIcon: /*#__PURE__*/React.createElement(ArrowDropDownFilled, null)
   })), /*#__PURE__*/React.createElement("label", {

package/es/table-col/demo/index.less

@@ -0,0 +1,8 @@
+.table-col-cls {
+  background-color: red;
+}
+
+.align-center {
+  text-align: 'center';
+  background-color: 'pink';
+}

package/es/table-col/index.js

@@ -1,4 +1,5 @@
 import React from 'react';
+import classNames from 'classnames';
 var TableCol = function TableCol(_a) {
   var children = _a.children,
     width = _a.width,
@@ -7,7 +8,7 @@ var TableCol = function TableCol(_a) {
     style: {
       width: "".concat(width, "px")
     },
-    className: className
+    className: classNames('a-table-col', className)
   }, children);
 };
 export default TableCol;

package/es/table-col/style/index.css

@@ -0,0 +1,3 @@
+.a-table-col {
+  display: inline-block;
+}

package/es/table-col/style/index.d.ts

@@ -1 +1 @@
-
+import './index.less';

package/es/table-col/style/index.js

@@ -0,0 +1 @@
+import './index.less';

package/es/table-col/style/index.less

@@ -0,0 +1,5 @@
+@import '../../style/variables.less';
+
+.a-table-col {
+  display: inline-block;
+}

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

@@ -191,20 +191,24 @@ var LabelConditionSelectInput = function LabelConditionSelectInput(props) {
       changedEntryType: blurEntryType
     }));
   };
-  /** 二级下拉框清空 */
-  var onTypeSelectClear = function onTypeSelectClear() {
-    var finalSelectInputValue = {
-      selectValue: selectInputValue.selectValue,
-      inputValue: [],
-      changedEntryType: EntryTypeEnum.SECOND_ENTRY
-    };
-    if (isSubSelectMultiple) {
-      finalSelectInputValue = __assign(__assign({}, finalSelectInputValue), {
-        finalSelectValue: findAllSubSelectItems(optionsList, selectInputValue.selectValue)
-      });
-    }
-    onBlur === null || onBlur === void 0 ? void 0 : onBlur(finalSelectInputValue);
-  };
+  // /** 二级下拉框清空 */
+  // const onTypeSelectClear = () => {
+  //   let finalSelectInputValue: ValueType = {
+  //     selectValue: selectInputValue.selectValue,
+  //     inputValue: [],
+  //     changedEntryType: EntryTypeEnum.SECOND_ENTRY,
+  //   };
+  //   if (isSubSelectMultiple) {
+  //     finalSelectInputValue = {
+  //       ...finalSelectInputValue,
+  //       finalSelectValue: findAllSubSelectItems(
+  //         optionsList,
+  //         selectInputValue.selectValue,
+  //       ),
+  //     };
+  //   }
+  //   onBlur?.(finalSelectInputValue);
+  // };
   // 是否展示输入框
   var isShowInput = !(0, isNil_1["default"])(selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.selectValue) && !(hiddenInputKeys === null || hiddenInputKeys === void 0 ? void 0 : hiddenInputKeys.includes(selectInputValue.selectValue));
   var typeInput = isInput ? react_1["default"].createElement(label_condition_input_1["default"], __assign({}, conditionInputProps, {
@@ -221,10 +225,13 @@ var LabelConditionSelectInput = function LabelConditionSelectInput(props) {
     onChange: onTypeSelectChange,
     value: selectInputValue === null || selectInputValue === void 0 ? void 0 : selectInputValue.inputValue,
     options: subSelectOptions,
+    onDeselect: function onDeselect() {
+      var _a;
+      (_a = subSelectRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    },
     onBlur: function onBlur() {
       return onLabelConditionSelectInputBlur(EntryTypeEnum.SECOND_ENTRY);
-    },
-    onClear: onTypeSelectClear
+    }
   })));
   return react_1["default"].createElement("div", {
     className: (0, classnames_1["default"])('label-condition-select', className)

package/lib/label-select/index.js

@@ -103,6 +103,10 @@ var LabelSelect = function LabelSelect(props, ref) {
     className: "label-select-selector",
     onChange: handleChange,
     onBlur: handleBlur,
+    onDeselect: function onDeselect() {
+      var _a;
+      (_a = selectRef.current) === null || _a === void 0 ? void 0 : _a.focus();
+    },
     onDropdownVisibleChange: onDropdownVisibleChange,
     suffixIcon: react_1["default"].createElement(ArrowDropDownFilled_1["default"], null)
   })), react_1["default"].createElement("label", {

package/lib/table-col/demo/index.less

@@ -0,0 +1,8 @@
+.table-col-cls {
+  background-color: red;
+}
+
+.align-center {
+  text-align: 'center';
+  background-color: 'pink';
+}

package/lib/table-col/index.js

@@ -9,6 +9,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var react_1 = __importDefault(require("react"));
+var classnames_1 = __importDefault(require("classnames"));
 var TableCol = function TableCol(_a) {
   var children = _a.children,
     width = _a.width,
@@ -17,7 +18,7 @@ var TableCol = function TableCol(_a) {
     style: {
       width: "".concat(width, "px")
     },
-    className: className
+    className: (0, classnames_1["default"])('a-table-col', className)
   }, children);
 };
 exports["default"] = TableCol;

package/lib/table-col/style/index.css

@@ -0,0 +1,3 @@
+.a-table-col {
+  display: inline-block;
+}

package/lib/table-col/style/index.d.ts

@@ -1 +1 @@
-
+import './index.less';

package/lib/table-col/style/index.js

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

package/lib/table-col/style/index.less

@@ -0,0 +1,5 @@
+@import '../../style/variables.less';
+
+.a-table-col {
+  display: inline-block;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "assui",
-  "version": "3.1.58",
+  "version": "3.1.60",
   "description": "react ui library",
   "author": "jason <usochen@gmail.com>",
   "main": "./lib/index.js",
@@ -80,5 +80,5 @@
     "node": ">=10.0.0"
   },
   "license": "MIT",
-  "gitHead": "57f32a4e372be97f4b309485acaad64ec01c8a78"
+  "gitHead": "004de3d80594f82f62678d8183c8d5dc0fcb3bb0"
 }