@kdcloudjs/kdesign 1.7.67 → 1.7.68-stable.2

package/es/color-picker/color-picker-panel.js

@@ -14,8 +14,9 @@ import Color from 'color';
 import { ChromePicker } from 'react-color';
 import devWarning from '../_utils/devwarning';
 import { useOnClickOutside } from '../_utils/hooks';
+import { isIE } from '../_utils/ieUtil';
 var ColorPickerPanel = function ColorPickerPanel(props) {
-  var _classNames, _context;
+  var _classNames, _classNames2, _context;
   var setCorrectColorValue = props.setCorrectColorValue,
     setInputColorValue = props.setInputColorValue,
     setAlpha = props.setAlpha,
@@ -61,7 +62,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
   var panelContainerCls = classNames("".concat(colorPickerPrefixCls, "-panel-container"));
   var panelInputCls = classNames("".concat(colorPickerPrefixCls, "-panel-container-input"));
   var transparentCls = classNames("".concat(colorPickerPrefixCls, "-panel-container-transparent"));
-  var colorDivContainerCls = classNames("".concat(colorPickerPrefixCls, "-panel-colorDivContainer"), _defineProperty({}, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-unset-color"), (presetColor === null || presetColor === void 0 ? void 0 : presetColor.length) === 0));
+  var colorDivContainerCls = classNames("".concat(colorPickerPrefixCls, "-panel-colorDivContainer"), (_classNames2 = {}, _defineProperty(_classNames2, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-unset-color"), (presetColor === null || presetColor === void 0 ? void 0 : presetColor.length) === 0), _defineProperty(_classNames2, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-ie11"), isIE), _classNames2));
   var colorLiClick = function colorLiClick(index, colorValue) {
     var formatArr = colorFormat(colorValue, alpha);
     var formatValue = toLowerCase(formatArr[valOfCorrespondingType(currentColorType)].value);

package/es/color-picker/style/index.css

@@ -314,8 +314,8 @@
 }
 .kd-color-picker-pop .kd-color-picker-panel-container-transparent {
   -webkit-box-flex: 0;
-      -ms-flex: 0 0 60px;
-          flex: 0 0 60px;
+      -ms-flex: 0 1 60px;
+          flex: 0 1 60px;
   height: 28px;
   margin-left: 8px;
   text-align: center;
@@ -328,6 +328,23 @@
   grid-row-gap: 8px;
   margin-top: 12px;
 }
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-wrap: wrap;
+      flex-wrap: wrap;
+}
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li {
+  margin-right: 8px;
+  margin-top: 8px;
+}
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li:nth-child(12n) {
+  margin-right: 0;
+}
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li:nth-child(-n+12) {
+  margin-top: 0;
+}
 .kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-unset-color {
   margin-top: 0;
 }

package/es/color-picker/style/index.less

@@ -257,7 +257,7 @@
       }
 
       &-transparent {
-        flex: 0 0 60px;
+        flex: 0 1 60px;
         height: 28px;
         margin-left: 8px;
         text-align: center;
@@ -272,6 +272,24 @@
       grid-row-gap: 8px;
       margin-top: 12px;
 
+      &-ie11 {
+        display: flex;
+        flex-wrap: wrap;
+
+        li {
+          margin-right: 8px;
+          margin-top: 8px;
+
+          &:nth-child(12n) {
+            margin-right: 0;
+          }
+
+          &:nth-child(-n+12) {
+            margin-top: 0;
+          }
+        }
+      }
+
       &-unset-color {
         margin-top: 0;
       }

package/es/style/core/reset.less

@@ -24,8 +24,8 @@ input,
 textarea,
 select,
 button {
-  font-family: 'Microsoft YaHei', 'PingFangSC-Regular', 'Helvetica Neue', Helvetica, Arial, 'Hiragino Sans GB',
-    'WenQuanYi Micro Hei', sans-serif;
+  font-family: 'Roboto', 'San Francisco', 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragina Sans GB',
+    'WenQuanYi Micro Hei', 'microsoft yahei ui', 'microsoft yahei', sans-serif;
 }
 
 body {

package/es/style/index.css

@@ -1687,7 +1687,7 @@ input,
 textarea,
 select,
 button {
-  font-family: 'Microsoft YaHei', 'PingFangSC-Regular', 'Helvetica Neue', Helvetica, Arial, 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
+  font-family: 'Roboto', 'San Francisco', 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragina Sans GB', 'WenQuanYi Micro Hei', 'microsoft yahei ui', 'microsoft yahei', sans-serif;
 }
 body {
   -webkit-box-sizing: border-box;

package/es/table/table.js

@@ -93,10 +93,10 @@ var Table = /*#__PURE__*/forwardRef(function (props, ref) {
   /* -------------------------------------------------------------------------- */
   /* features                                                                   */
   /* -------------------------------------------------------------------------- */
-  useRowSelection(pipeline, rowSelection);
-  useRowDetail(pipeline, rowDetail);
   useFilter(pipeline, filter);
   useSort(pipeline, sort);
+  useRowSelection(pipeline, rowSelection);
+  useRowDetail(pipeline, rowDetail);
   useAutoRowSpan(pipeline, autoRowSpan);
   useTreeMode(pipeline, treeMode);
   usecolGroupExtendable(pipeline, columnGroupExtend);

package/lib/color-picker/color-picker-panel.js

@@ -23,12 +23,13 @@ var _color = _interopRequireDefault(require("color"));
 var _reactColor = require("react-color");
 var _devwarning = _interopRequireDefault(require("../_utils/devwarning"));
 var _hooks = require("../_utils/hooks");
+var _ieUtil = require("../_utils/ieUtil");
 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; }
 /* eslint-disable */
 
 var ColorPickerPanel = function ColorPickerPanel(props) {
-  var _classNames, _context;
+  var _classNames, _classNames2, _context;
   var setCorrectColorValue = props.setCorrectColorValue,
     setInputColorValue = props.setInputColorValue,
     setAlpha = props.setAlpha,
@@ -74,7 +75,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
   var panelContainerCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-container"));
   var panelInputCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-container-input"));
   var transparentCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-container-transparent"));
-  var colorDivContainerCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-colorDivContainer"), (0, _defineProperty2.default)({}, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-unset-color"), (presetColor === null || presetColor === void 0 ? void 0 : presetColor.length) === 0));
+  var colorDivContainerCls = (0, _classnames.default)("".concat(colorPickerPrefixCls, "-panel-colorDivContainer"), (_classNames2 = {}, (0, _defineProperty2.default)(_classNames2, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-unset-color"), (presetColor === null || presetColor === void 0 ? void 0 : presetColor.length) === 0), (0, _defineProperty2.default)(_classNames2, "".concat(colorPickerPrefixCls, "-panel-colorDivContainer-ie11"), _ieUtil.isIE), _classNames2));
   var colorLiClick = function colorLiClick(index, colorValue) {
     var formatArr = (0, _colorFormat.colorFormat)(colorValue, alpha);
     var formatValue = (0, _convertLetters.toLowerCase)(formatArr[(0, _colorFormat.valOfCorrespondingType)(currentColorType)].value);

package/lib/color-picker/style/index.css

@@ -314,8 +314,8 @@
 }
 .kd-color-picker-pop .kd-color-picker-panel-container-transparent {
   -webkit-box-flex: 0;
-      -ms-flex: 0 0 60px;
-          flex: 0 0 60px;
+      -ms-flex: 0 1 60px;
+          flex: 0 1 60px;
   height: 28px;
   margin-left: 8px;
   text-align: center;
@@ -328,6 +328,23 @@
   grid-row-gap: 8px;
   margin-top: 12px;
 }
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 {
+  display: -webkit-box;
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-wrap: wrap;
+      flex-wrap: wrap;
+}
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li {
+  margin-right: 8px;
+  margin-top: 8px;
+}
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li:nth-child(12n) {
+  margin-right: 0;
+}
+.kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-ie11 li:nth-child(-n+12) {
+  margin-top: 0;
+}
 .kd-color-picker-pop .kd-color-picker-panel-colorDivContainer-unset-color {
   margin-top: 0;
 }

package/lib/color-picker/style/index.less

@@ -257,7 +257,7 @@
       }
 
       &-transparent {
-        flex: 0 0 60px;
+        flex: 0 1 60px;
         height: 28px;
         margin-left: 8px;
         text-align: center;
@@ -272,6 +272,24 @@
       grid-row-gap: 8px;
       margin-top: 12px;
 
+      &-ie11 {
+        display: flex;
+        flex-wrap: wrap;
+
+        li {
+          margin-right: 8px;
+          margin-top: 8px;
+
+          &:nth-child(12n) {
+            margin-right: 0;
+          }
+
+          &:nth-child(-n+12) {
+            margin-top: 0;
+          }
+        }
+      }
+
       &-unset-color {
         margin-top: 0;
       }

package/lib/style/core/reset.less

@@ -24,8 +24,8 @@ input,
 textarea,
 select,
 button {
-  font-family: 'Microsoft YaHei', 'PingFangSC-Regular', 'Helvetica Neue', Helvetica, Arial, 'Hiragino Sans GB',
-    'WenQuanYi Micro Hei', sans-serif;
+  font-family: 'Roboto', 'San Francisco', 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragina Sans GB',
+    'WenQuanYi Micro Hei', 'microsoft yahei ui', 'microsoft yahei', sans-serif;
 }
 
 body {

package/lib/style/index.css

@@ -1687,7 +1687,7 @@ input,
 textarea,
 select,
 button {
-  font-family: 'Microsoft YaHei', 'PingFangSC-Regular', 'Helvetica Neue', Helvetica, Arial, 'Hiragino Sans GB', 'WenQuanYi Micro Hei', sans-serif;
+  font-family: 'Roboto', 'San Francisco', 'Helvetica Neue', Helvetica, Arial, 'PingFang SC', 'Hiragina Sans GB', 'WenQuanYi Micro Hei', 'microsoft yahei ui', 'microsoft yahei', sans-serif;
 }
 body {
   -webkit-box-sizing: border-box;

package/lib/table/table.js

@@ -105,10 +105,10 @@ var Table = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
   /* -------------------------------------------------------------------------- */
   /* features                                                                   */
   /* -------------------------------------------------------------------------- */
-  (0, _rowSelection.default)(pipeline, rowSelection);
-  (0, _rowDetail.default)(pipeline, rowDetail);
   (0, _filter2.default)(pipeline, filter);
   (0, _sort2.default)(pipeline, sort);
+  (0, _rowSelection.default)(pipeline, rowSelection);
+  (0, _rowDetail.default)(pipeline, rowDetail);
   (0, _autoRowSpan.default)(pipeline, autoRowSpan);
   (0, _treeMode.default)(pipeline, treeMode);
   (0, _colGroupExtendable.default)(pipeline, columnGroupExtend);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.7.67",
+  "version": "1.7.68-stable.2",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [
@@ -61,6 +61,7 @@
     "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s -r 0 && node scripts/filter-changelog.js",
     "pub": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --no-tests",
     "pub:beta": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=beta",
+    "pub:stable": "npm run test:all && npm run build && cross-env PUB_ENV=pub np --no-cleanup --anyBranch --no-tests --tag=1.7.68-stable",
     "prepublishOnly": "node scripts/guard.js",
     "new": "node scripts/create-component.js",
     "token": "node scripts/generate-token.js",