@kdcloudjs/kdesign 1.6.13 → 1.6.15

package/es/form/hooks/useForm.js

@@ -11,8 +11,7 @@ import Schema from 'async-validator';
 import cloneDeep from 'lodash/cloneDeep';
 import get from 'lodash/get';
 import merge from 'lodash/merge';
-import set from 'lodash/set'; // import useForceUpdate from './useForceUpdate'
-
+import set from 'lodash/set';
 import devwarning from '../../_utils/devwarning';
 export var INTERNAL_HOOK_KEY = '__KD_INTERNAL_FORM_HOOK__';
 
@@ -21,16 +20,12 @@ var FormStore = /*#__PURE__*/_createClass(function FormStore() {
 
   _classCallCheck(this, FormStore);
 
-  this.isMounted = false; // private forceRootUpdate:() => void
-
+  this.isMounted = false;
   this.defaultValues = {};
   this.store = {};
   this.fields = {};
-  this.rules = {};
   this.errorMessages = {};
-  this.callbacks = {}; // constructor (forceRootUpdate: () => void) {
-  //   this.forceRootUpdate = forceRootUpdate
-  // }
+  this.callbacks = {};
 
   this.getForm = function () {
     return {
@@ -42,7 +37,6 @@ var FormStore = /*#__PURE__*/_createClass(function FormStore() {
       resetFields: _this.resetFields,
       setFieldValue: _this.setFieldValue,
       setFieldsValue: _this.setFieldsValue,
-      setRules: _this.setRules,
       validateFields: _this.validateFields,
       submit: _this.submit,
       getInternalHooks: _this.getInternalHooks
@@ -60,7 +54,8 @@ var FormStore = /*#__PURE__*/_createClass(function FormStore() {
       dispatch: _this.dispatch,
       setDefaultValues: _this.setDefaultValues,
       setCallbacks: _this.setCallbacks,
-      registerField: _this.registerField
+      registerField: _this.registerField,
+      deleteField: _this.deleteField
     };
   };
 
@@ -169,25 +164,25 @@ var FormStore = /*#__PURE__*/_createClass(function FormStore() {
   this.getRules = function (namePathList) {
     _this.warningUnhooked();
 
-    if (!namePathList) {
-      return _this.rules;
+    var list = cloneDeep(namePathList);
+
+    if (!list) {
+      list = _Object$keys(_this.fields);
     }
 
     var rules = {};
-    namePathList.forEach(function (name) {
-      if (_this.rules[name]) {
-        rules[name] = cloneDeep(_this.rules[name]);
+    list.forEach(function (name) {
+      var _a, _b;
+
+      var current = _this.fields[name].current;
+
+      if ((_a = current === null || current === void 0 ? void 0 : current.meta) === null || _a === void 0 ? void 0 : _a.rules) {
+        rules[name] = cloneDeep((_b = current === null || current === void 0 ? void 0 : current.meta) === null || _b === void 0 ? void 0 : _b.rules);
       }
     });
     return _Object$keys(rules).length === 0 ? null : rules;
   };
 
-  this.setRules = function (name, rules) {
-    _this.warningUnhooked();
-
-    set(_this.rules, name, rules);
-  };
-
   this.setCallbacks = function (callbacks) {
     _this.warningUnhooked();
 
@@ -231,27 +226,19 @@ var FormStore = /*#__PURE__*/_createClass(function FormStore() {
       onValuesChange(_defineProperty({}, name, value), cloneDeep(_this.store));
     }
   };
-  /**
-   * 注册 Field
-   * Field 如果带有验证规则的话，则注册时进行校验
-   * @param name Field 名称
-   * @param field Field 实例
-   */
-
 
   this.registerField = function (name, field) {
     _this.warningUnhooked();
 
     _this.fields[name] = field;
-    var meta = field.meta;
+  };
 
-    if (meta.rules !== undefined) {
-      _this.setRules(name, meta.rules); // TODO: 初始化的时候是否需要校验？？
-      // this.validateFields([name]).catch(({ errorInfos }) => {
-      //   this.validateFieldFaild(errorInfos, 'internal')
-      // })
+  this.deleteField = function (name) {
+    _this.warningUnhooked();
 
-    }
+    Object.hasOwnProperty.call(_this.fields, name) && delete _this.fields[name];
+    Object.hasOwnProperty.call(_this.errorMessages, name) && delete _this.errorMessages[name];
+    Object.hasOwnProperty.call(_this.store, name) && delete _this.store[name];
   };
 
   this.validateFields = function (namePathList) {
@@ -296,7 +283,11 @@ var FormStore = /*#__PURE__*/_createClass(function FormStore() {
       _this.notifyObservers(_this.store, namePathList || [], 'validateFinish');
     }).catch(function (_ref2) {
       var errorInfos = _ref2.errorInfos;
-      _this.errorMessages = {};
+
+      if (!namePathList) {
+        _this.errorMessages = {};
+      }
+
       var _errorInfos$fields = errorInfos.fields,
           fields = _errorInfos$fields === void 0 ? {} : _errorInfos$fields;
 
@@ -336,7 +327,7 @@ var FormStore = /*#__PURE__*/_createClass(function FormStore() {
     _this.warningUnhooked();
 
     _Object$values(_this.fields).forEach(function (_ref4) {
-      var onStoreChange = _ref4.onStoreChange;
+      var onStoreChange = _ref4.current.onStoreChange;
       var stores = {
         prev: prevStore,
         curr: _this.store
@@ -347,16 +338,12 @@ var FormStore = /*#__PURE__*/_createClass(function FormStore() {
 });
 
 function useForm(form) {
-  var formRef = React.useRef(); // const forceUpdate = useForceUpdate()
+  var formRef = React.useRef();
 
   if (!formRef.current) {
     if (form) {
       formRef.current = form;
     } else {
-      // Create a new FormStore if not provided
-      // const forceReRender = () => {
-      //   forceUpdate()
-      // }
       var formStore = new FormStore();
       formRef.current = formStore.getForm();
     }

package/es/form/interface.d.ts

@@ -10,7 +10,9 @@ export interface FieldError {
     [name: string]: string;
 }
 export interface Fields {
-    [name: string]: FieldInstance;
+    [name: string]: {
+        current: FieldInstance;
+    };
 }
 export interface FormInstance<Values = any> {
     getFieldError: (name: NamePath) => string | undefined;
@@ -21,7 +23,6 @@ export interface FormInstance<Values = any> {
     resetFields: (fields?: NamePath[]) => void;
     setFieldsValue: (value: Values) => void;
     setFieldValue: (name: NamePath, value: Values) => void;
-    setRules: (name: NamePath, rules: any) => void;
     validateFields: (namePathList?: NamePath[]) => Promise<Values>;
     submit: () => void;
     getInternalHooks: (secret: string) => InternalHooks | null;
@@ -71,7 +72,10 @@ export interface InternalHooks {
     dispatch: (action: ReducerAction) => void;
     setDefaultValues: (values: Store) => void;
     setCallbacks: (callbacks: Callbacks) => void;
-    registerField: (name: NamePath, field: FieldInstance) => void;
+    registerField: (name: NamePath, field: {
+        current: FieldInstance;
+    }) => void;
+    deleteField: (name: NamePath) => void;
 }
 export declare type NotifySource = 'externalUpdateValue' | 'updateValue' | 'reset' | 'validateField' | 'validateFinish';
 export interface ValidateErrorEntity<Values = any> {

package/es/icon/icon.js

@@ -1,6 +1,21 @@
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
+import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
+
+var __rest = this && this.__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;
+};
+
 import React, { useContext } from 'react';
 import classNames from 'classnames';
 import ConfigContext from '../config-provider/ConfigContext';
@@ -13,6 +28,7 @@ var InternalIcon = function InternalIcon(props, ref) {
       userDefaultProps = _useContext.compDefaultProps;
 
   var iconProps = getCompProps('Icon', userDefaultProps, props);
+
   var type = iconProps.type,
       spin = iconProps.spin,
       style = iconProps.style,
@@ -21,7 +37,9 @@ var InternalIcon = function InternalIcon(props, ref) {
       rotate = iconProps.rotate,
       onClick = iconProps.onClick,
       onMouseEnter = iconProps.onMouseEnter,
-      onMouseLeave = iconProps.onMouseLeave;
+      onMouseLeave = iconProps.onMouseLeave,
+      others = __rest(iconProps, ["type", "spin", "style", "prefix", "className", "rotate", "onClick", "onMouseEnter", "onMouseLeave"]);
+
   var innerRef = React.useRef();
   var iconRef = ref || innerRef;
   var iconPrefix = prefix || iconProps.iconPrefix;
@@ -45,14 +63,15 @@ var InternalIcon = function InternalIcon(props, ref) {
     iconStyle.transform = "rotate(".concat(rotate, "deg)");
   }
 
-  return /*#__PURE__*/React.createElement("i", {
+  return /*#__PURE__*/React.createElement("i", _extends({
     className: iconClass,
     onClick: handleClick,
     onMouseEnter: handleMouseEnter,
     onMouseLeave: handleMouseLeave,
-    style: iconStyle,
+    style: iconStyle
+  }, others, {
     ref: iconRef
-  });
+  }));
 };
 
 var Icon = /*#__PURE__*/React.forwardRef(InternalIcon);

package/es/image/preview.d.ts

@@ -5,6 +5,7 @@ export interface PreviewProps {
     alt?: string;
     name?: string;
     size?: string;
+    scales?: Array<number>;
     visible: boolean;
     type?: PreviewType;
     className?: string;

package/es/image/preview.js

@@ -1,5 +1,6 @@
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
+import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import * as React from 'react';
 import ReactDOM from 'react-dom';
@@ -24,6 +25,7 @@ var Preview = function Preview(props) {
       alt = allProps.alt,
       name = allProps.name,
       size = allProps.size,
+      scales = allProps.scales,
       visible = allProps.visible,
       onClose = allProps.onClose,
       current = allProps.current,
@@ -53,14 +55,28 @@ var Preview = function Preview(props) {
       scale = _React$useState6[0],
       setScale = _React$useState6[1];
 
+  var maxScale = scales[scales.length - 1] / 100;
+  var minScale = scales[0] / 100;
   React.useEffect(function () {
     if (show) {
       document.body.style.overflow = 'hidden';
       var throMouseWheel = throttle(function (e) {
         if (e.wheelDelta > 0) {
-          setScale(scale + 0.1);
+          if (scale > maxScale) return;
+
+          if (scale + 0.1 > maxScale) {
+            setScale(maxScale);
+          } else {
+            setScale(scale + 0.1);
+          }
         } else if (e.wheelDelta < 0) {
-          if (scale > 1) setScale(scale - 0.1);
+          if (scale < minScale) return;
+
+          if (scale - 0.1 < minScale) {
+            setScale(minScale);
+          } else {
+            setScale(scale - 0.1);
+          }
         }
       }, 200);
       document.addEventListener('mousewheel', throMouseWheel);
@@ -74,12 +90,18 @@ var Preview = function Preview(props) {
   }, [show, scale]);
 
   var handleZoomOut = function handleZoomOut() {
-    var newScale = scale - 1;
-    setScale(Math.max(newScale, 1));
+    var nextScale = scales.findLast(function (s) {
+      return s / 100 < scale;
+    });
+    if (nextScale !== undefined) setScale(nextScale / 100);
   };
 
   var handleZoomIn = function handleZoomIn() {
-    setScale(scale + 1);
+    var nextScale = _findInstanceProperty(scales).call(scales, function (s) {
+      return s / 100 > scale;
+    });
+
+    if (nextScale !== undefined) setScale(nextScale / 100);
   };
 
   var previewImgProps = {
@@ -121,11 +143,14 @@ var Preview = function Preview(props) {
   }), /*#__PURE__*/React.createElement(Icon, {
     type: "shrink",
     className: classNames({
-      disabled: scale <= 1
+      disabled: scale <= minScale
     }),
     onClick: handleZoomOut
   }), /*#__PURE__*/React.createElement(Icon, {
     type: "zoom",
+    className: classNames({
+      disabled: scale >= maxScale
+    }),
     onClick: handleZoomIn
   }), props.type !== 'upload' && operations, props.type !== 'upload' && length && /*#__PURE__*/React.createElement(Icon, {
     type: "arrow-right",

package/es/input/style/index.css

@@ -259,6 +259,7 @@ textarea {
   padding: var(--kd-c-input-spacing-padding-vertical-small, 3px) var(--kd-c-input-spacing-padding-horizontal-small, 9px);
 }
 .kd-input-wrapper {
+  padding-left: var(--kd-c-input-wrapper-padding-left, 0px) !important;
   width: 100%;
   min-width: 0;
   border: var(--kd-c-input-sizing-border, 1px) solid var(--kd-c-input-color-border-disabled, var(--kd-g-color-border-strong, #d9d9d9));
@@ -306,7 +307,7 @@ textarea {
 }
 .kd-input-wrapper .kd-input {
   border: none;
-  padding-left: 0;
+  padding-left: var(--kd-c-input-padding-left, 9px);
   padding-right: 0;
   height: 100%;
 }
@@ -453,8 +454,8 @@ textarea {
   font-size: 14px;
   font-variant: tabular-nums;
   list-style: none;
-  -webkit-font-feature-settings: "tnum";
-          font-feature-settings: "tnum";
+  -webkit-font-feature-settings: 'tnum';
+          font-feature-settings: 'tnum';
   position: relative;
   display: -webkit-box;
   display: -ms-flexbox;