@kdcloudjs/kdesign 1.6.30 → 1.6.31

package/es/_utils/testBrowserType.d.ts

@@ -0,0 +1 @@
+export declare function testBrowserType(reg: RegExp, type: number): boolean;

package/es/_utils/testBrowserType.js

@@ -0,0 +1,11 @@
+export function testBrowserType(reg, type) {
+  var external = window.external || {};
+
+  for (var i in external) {
+    if (reg.test(type ? external[i] : i)) {
+      return true;
+    }
+  }
+
+  return false;
+}

package/es/form/style/index.css

@@ -120,6 +120,10 @@
   display: -ms-flexbox;
   display: flex;
 }
+.kd-form-horizontal .kd-form-field-label {
+  -ms-flex-negative: 0;
+      flex-shrink: 0;
+}
 .kd-form-inline .kd-form-field {
   display: -webkit-inline-box;
   display: -ms-inline-flexbox;

package/es/form/style/index.less

@@ -17,6 +17,12 @@
     }
   }
 
+  &-horizontal {
+    .@{field-label-cls} {
+      flex-shrink: 0;
+    }
+  }
+
   &-inline {
     .@{field-prefix-cls} {
       display: inline-flex;

package/es/grid/col.js

@@ -4,6 +4,7 @@ import * as React from 'react';
 import classNames from 'classnames';
 import { getCompProps } from '../_utils';
 import { ConfigContext } from '../config-provider';
+import { testBrowserType } from '../_utils/testBrowserType';
 
 var Col = function Col(props) {
   var _React$useContext = React.useContext(ConfigContext),
@@ -28,9 +29,11 @@ var Col = function Col(props) {
       winWidth = _getCompProps.winWidth,
       children = _getCompProps.children,
       className = _getCompProps.className,
-      customPrefixcls = _getCompProps.prefixCls; // className前缀
+      customPrefixcls = _getCompProps.prefixCls; // 浏览器名称
 
 
+  var isSogou = testBrowserType(/^sogou/i, 0); // className前缀
+
   var prefixCls = getPrefixCls(pkgPrefixCls, 'col', customPrefixcls);
   var columns = 24;
   var base = {
@@ -97,7 +100,9 @@ var Col = function Col(props) {
   }, style);
 
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames(prefixCls, className),
+    className: classNames(prefixCls, className, {
+      'sogou-col': isSogou
+    }),
     style: styleString
   }, children);
 };

package/es/grid/row.js

@@ -6,6 +6,7 @@ import classNames from 'classnames';
 import { getCompProps } from '../_utils';
 import { ConfigContext } from '../config-provider';
 import throttle from 'lodash/throttle';
+import { testBrowserType } from '../_utils/testBrowserType';
 
 function getGap(gutter, width) {
   var xs = gutter.xs,
@@ -39,9 +40,11 @@ var Row = function Row(props) {
       gutter = _getCompProps.gutter,
       align = _getCompProps.align,
       justify = _getCompProps.justify,
-      customPrefixcls = _getCompProps.prefixCls; // className前缀
+      customPrefixcls = _getCompProps.prefixCls; // 浏览器名称
 
 
+  var isSogou = testBrowserType(/^sogou/i, 0); // className前缀
+
   var prefixCls = getPrefixCls(pkgPrefixCls, 'row', customPrefixcls);
 
   var _React$useState = React.useState(window.innerWidth),
@@ -99,6 +102,8 @@ var Row = function Row(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: classNames(prefixCls, className, {
       nowrap: !wrap
+    }, {
+      'sogou-row': isSogou
     }),
     style: styleString
   }, _mapInstanceProperty(_context = React.Children).call(_context, children, function (child) {

package/es/grid/style/index.css

@@ -119,9 +119,15 @@
   -ms-flex-wrap: nowrap;
       flex-wrap: nowrap;
 }
+.kd-row.sogou-row {
+  margin-bottom: calc(-1 * var(--rgap));
+}
 .kd-col {
   position: relative;
   -webkit-box-sizing: border-box;
           box-sizing: border-box;
   padding: 0 calc(var(--cgap) / 2);
 }
+.kd-col.sogou-col {
+  margin-bottom: var(--rgap);
+}

package/es/grid/style/index.less

@@ -13,10 +13,18 @@
   &.nowrap {
     flex-wrap: nowrap;
   }
+
+  &.sogou-row {
+    margin-bottom: calc(-1 * var(--rgap));
+  }
 }
 
 .@{col-prefix-cls} {
   position: relative;
   box-sizing: border-box;
   padding: 0 calc(var(--cgap) / 2);
+
+  &.sogou-col {
+    margin-bottom: var(--rgap);
+  }
 }

package/es/select/select.js

@@ -411,31 +411,42 @@ var InternalSelect = function InternalSelect(props, ref) {
         selectedVal = _multipleRef$current3.selectedVal,
         selectMulOpts = _multipleRef$current3.selectMulOpts;
 
-    if (!('value' in selectProps)) {
-      if ((filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) !== selectedVal.length) {
-        _mapInstanceProperty(filledOptions).call(filledOptions, function (child) {
-          var _ref = child.props || child,
-              value = _ref.value;
-
-          if (!_includesInstanceProperty(selectedVal).call(selectedVal, value)) {
-            selectedVal.push(value);
-            selectMulOpts.push({
-              value: value,
-              label: getOptionLabel(child)
-            });
-          }
-        });
+    var newSelectedVal = _toConsumableArray(selectedVal);
+
+    var newSelectMulOpts = _toConsumableArray(selectMulOpts);
+
+    if ((filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) !== newSelectedVal.length) {
+      _mapInstanceProperty(filledOptions).call(filledOptions, function (child) {
+        var _ref = child.props || child,
+            value = _ref.value;
+
+        if (!_includesInstanceProperty(newSelectedVal).call(newSelectedVal, value)) {
+          newSelectedVal.push(value);
+          newSelectMulOpts.push({
+            value: value,
+            label: getOptionLabel(child)
+          });
+        }
+      });
 
-        setMulOptions(_toConsumableArray(selectMulOpts));
+      if (typeof value === 'undefined') {
+        multipleRef.current.selectedVal = newSelectedVal;
+        multipleRef.current.selectMulOpts = newSelectMulOpts;
+        setMulOptions(_toConsumableArray(newSelectMulOpts));
         setSearchValue('');
-      } else {
-        multipleRef.current.selectedVal = selectedVal = [];
-        multipleRef.current.selectMulOpts = selectMulOpts = [];
+      }
+    } else {
+      newSelectedVal = [];
+      newSelectMulOpts = [];
+
+      if (typeof value === 'undefined') {
+        multipleRef.current.selectedVal = [];
+        multipleRef.current.selectMulOpts = [];
         setMulOptions([]);
       }
     }
 
-    onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
+    onChange && onChange(labelInValue ? newSelectMulOpts : newSelectedVal, newSelectMulOpts);
   }; // 输入框变化搜索内容
 
 

package/es/select/style/index.css

@@ -298,6 +298,8 @@
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  right: 28px;
+  left: 0;
 }
 .kd-select-borderless {
   border: none;

package/es/select/style/index.less

@@ -67,6 +67,8 @@
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
+    right: 28px;
+    left: 0;
   }
 
   &-borderless {

package/es/tree/treeHooks.js

@@ -83,7 +83,7 @@ export var useExpand = function useExpand(flattenAllData, expandedKeysProps, def
 
   React.useEffect(function () {
     setExpandedKeys(initialExpandedKeys);
-  }, [expandedKeysProps, searchExpandedKeys, defaultExpandAll, defaultExpandedKeys, defaultExpandRoot, defaultExpandParent]);
+  }, [flattenAllData, expandedKeysProps, searchExpandedKeys, defaultExpandAll, defaultExpandedKeys, defaultExpandRoot, defaultExpandParent]);
   return [expandedKeys, setExpandedKeys];
 };
 export var useScrollToKey = function useScrollToKey(scrollKey, index, estimatedItemSize, scrollRef, viewportHeight, treeNodePrefixCls) {

package/lib/_utils/testBrowserType.d.ts

@@ -0,0 +1 @@
+export declare function testBrowserType(reg: RegExp, type: number): boolean;

package/lib/_utils/testBrowserType.js

@@ -0,0 +1,18 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.testBrowserType = testBrowserType;
+
+function testBrowserType(reg, type) {
+  var external = window.external || {};
+
+  for (var i in external) {
+    if (reg.test(type ? external[i] : i)) {
+      return true;
+    }
+  }
+
+  return false;
+}

package/lib/form/style/index.css

@@ -120,6 +120,10 @@
   display: -ms-flexbox;
   display: flex;
 }
+.kd-form-horizontal .kd-form-field-label {
+  -ms-flex-negative: 0;
+      flex-shrink: 0;
+}
 .kd-form-inline .kd-form-field {
   display: -webkit-inline-box;
   display: -ms-inline-flexbox;

package/lib/form/style/index.less

@@ -17,6 +17,12 @@
     }
   }
 
+  &-horizontal {
+    .@{field-label-cls} {
+      flex-shrink: 0;
+    }
+  }
+
   &-inline {
     .@{field-prefix-cls} {
       display: inline-flex;

package/lib/grid/col.js

@@ -25,6 +25,8 @@ var _utils = require("../_utils");
 
 var _configProvider = require("../config-provider");
 
+var _testBrowserType = require("../_utils/testBrowserType");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -52,8 +54,10 @@ var Col = function Col(props) {
       winWidth = _getCompProps.winWidth,
       children = _getCompProps.children,
       className = _getCompProps.className,
-      customPrefixcls = _getCompProps.prefixCls; // className前缀
+      customPrefixcls = _getCompProps.prefixCls; // 浏览器名称
+
 
+  var isSogou = (0, _testBrowserType.testBrowserType)(/^sogou/i, 0); // className前缀
 
   var prefixCls = getPrefixCls(pkgPrefixCls, 'col', customPrefixcls);
   var columns = 24;
@@ -120,7 +124,9 @@ var Col = function Col(props) {
     marginLeft: base.offset && base.offset / columns * 100 + '%'
   }, style);
   return /*#__PURE__*/React.createElement("div", {
-    className: (0, _classnames.default)(prefixCls, className),
+    className: (0, _classnames.default)(prefixCls, className, {
+      'sogou-col': isSogou
+    }),
     style: styleString
   }, children);
 };

package/lib/grid/row.js

@@ -29,6 +29,8 @@ var _configProvider = require("../config-provider");
 
 var _throttle = _interopRequireDefault(require("lodash/throttle"));
 
+var _testBrowserType = require("../_utils/testBrowserType");
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "function") return null; var cacheBabelInterop = new _WeakMap(); var cacheNodeInterop = new _WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -65,8 +67,10 @@ var Row = function Row(props) {
       gutter = _getCompProps.gutter,
       align = _getCompProps.align,
       justify = _getCompProps.justify,
-      customPrefixcls = _getCompProps.prefixCls; // className前缀
+      customPrefixcls = _getCompProps.prefixCls; // 浏览器名称
+
 
+  var isSogou = (0, _testBrowserType.testBrowserType)(/^sogou/i, 0); // className前缀
 
   var prefixCls = getPrefixCls(pkgPrefixCls, 'row', customPrefixcls);
 
@@ -123,6 +127,8 @@ var Row = function Row(props) {
   return /*#__PURE__*/React.createElement("div", {
     className: (0, _classnames.default)(prefixCls, className, {
       nowrap: !wrap
+    }, {
+      'sogou-row': isSogou
     }),
     style: styleString
   }, (0, _map.default)(_context = React.Children).call(_context, children, function (child) {

package/lib/grid/style/index.css

@@ -119,9 +119,15 @@
   -ms-flex-wrap: nowrap;
       flex-wrap: nowrap;
 }
+.kd-row.sogou-row {
+  margin-bottom: calc(-1 * var(--rgap));
+}
 .kd-col {
   position: relative;
   -webkit-box-sizing: border-box;
           box-sizing: border-box;
   padding: 0 calc(var(--cgap) / 2);
 }
+.kd-col.sogou-col {
+  margin-bottom: var(--rgap);
+}

package/lib/grid/style/index.less

@@ -13,10 +13,18 @@
   &.nowrap {
     flex-wrap: nowrap;
   }
+
+  &.sogou-row {
+    margin-bottom: calc(-1 * var(--rgap));
+  }
 }
 
 .@{col-prefix-cls} {
   position: relative;
   box-sizing: border-box;
   padding: 0 calc(var(--cgap) / 2);
+
+  &.sogou-col {
+    margin-bottom: var(--rgap);
+  }
 }

package/lib/select/select.js

@@ -440,31 +440,41 @@ var InternalSelect = function InternalSelect(props, ref) {
     var _multipleRef$current3 = multipleRef.current,
         selectedVal = _multipleRef$current3.selectedVal,
         selectMulOpts = _multipleRef$current3.selectMulOpts;
+    var newSelectedVal = (0, _toConsumableArray2.default)(selectedVal);
+    var newSelectMulOpts = (0, _toConsumableArray2.default)(selectMulOpts);
+
+    if ((filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) !== newSelectedVal.length) {
+      (0, _map.default)(filledOptions).call(filledOptions, function (child) {
+        var _ref = child.props || child,
+            value = _ref.value;
+
+        if (!(0, _includes.default)(newSelectedVal).call(newSelectedVal, value)) {
+          newSelectedVal.push(value);
+          newSelectMulOpts.push({
+            value: value,
+            label: getOptionLabel(child)
+          });
+        }
+      });
 
-    if (!('value' in selectProps)) {
-      if ((filledOptions === null || filledOptions === void 0 ? void 0 : filledOptions.length) !== selectedVal.length) {
-        (0, _map.default)(filledOptions).call(filledOptions, function (child) {
-          var _ref = child.props || child,
-              value = _ref.value;
-
-          if (!(0, _includes.default)(selectedVal).call(selectedVal, value)) {
-            selectedVal.push(value);
-            selectMulOpts.push({
-              value: value,
-              label: getOptionLabel(child)
-            });
-          }
-        });
-        setMulOptions((0, _toConsumableArray2.default)(selectMulOpts));
+      if (typeof value === 'undefined') {
+        multipleRef.current.selectedVal = newSelectedVal;
+        multipleRef.current.selectMulOpts = newSelectMulOpts;
+        setMulOptions((0, _toConsumableArray2.default)(newSelectMulOpts));
         setSearchValue('');
-      } else {
-        multipleRef.current.selectedVal = selectedVal = [];
-        multipleRef.current.selectMulOpts = selectMulOpts = [];
+      }
+    } else {
+      newSelectedVal = [];
+      newSelectMulOpts = [];
+
+      if (typeof value === 'undefined') {
+        multipleRef.current.selectedVal = [];
+        multipleRef.current.selectMulOpts = [];
         setMulOptions([]);
       }
     }
 
-    onChange && onChange(labelInValue ? selectMulOpts : selectedVal, selectMulOpts);
+    onChange && onChange(labelInValue ? newSelectMulOpts : newSelectedVal, newSelectMulOpts);
   }; // 输入框变化搜索内容
 
 

package/lib/select/style/index.css

@@ -298,6 +298,8 @@
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
+  right: 28px;
+  left: 0;
 }
 .kd-select-borderless {
   border: none;

package/lib/select/style/index.less

@@ -67,6 +67,8 @@
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
+    right: 28px;
+    left: 0;
   }
 
   &-borderless {

package/lib/tree/treeHooks.js

@@ -123,7 +123,7 @@ var useExpand = function useExpand(flattenAllData, expandedKeysProps, defaultExp
 
   _react.default.useEffect(function () {
     setExpandedKeys(initialExpandedKeys);
-  }, [expandedKeysProps, searchExpandedKeys, defaultExpandAll, defaultExpandedKeys, defaultExpandRoot, defaultExpandParent]);
+  }, [flattenAllData, expandedKeysProps, searchExpandedKeys, defaultExpandAll, defaultExpandedKeys, defaultExpandRoot, defaultExpandParent]);
 
   return [expandedKeys, setExpandedKeys];
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.6.30",
+  "version": "1.6.31",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [