bkui-vue 2.0.2-beta.4 → 2.0.2-beta.40

package/lib/date-picker/index.js

@@ -1,9 +1,9 @@
 import "../styles/reset.css";
 import "./date-picker.less";
-import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_plugin_popover_300e25d0__ from "../plugin-popover";
 import * as __WEBPACK_EXTERNAL_MODULE__popperjs_core_a5c7319c__ from "@popperjs/core";
 import * as __WEBPACK_EXTERNAL_MODULE__loading_4d683b23__ from "../loading";
 import * as __WEBPACK_EXTERNAL_MODULE__overflow_title_f9bafa47__ from "../overflow-title";
+import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_popover_9b03f19d__ from "../popover";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__ from "../shared";
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "vue";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_config_provider_fe8577a3__ from "../config-provider";
@@ -13,9 +13,10 @@ import "../button/button.less";
 import * as __WEBPACK_EXTERNAL_MODULE_js_calendar_b62d9a01__ from "js-calendar";
 import * as __WEBPACK_EXTERNAL_MODULE_date_fns_f4130be9__ from "date-fns";
 import * as __WEBPACK_EXTERNAL_MODULE_lodash_debounce_3540babe__ from "lodash/debounce";
+import * as __WEBPACK_EXTERNAL_MODULE_lodash_cloneDeep_13f2b125__ from "lodash/cloneDeep";
 /******/ var __webpack_modules__ = ({
 
-/***/ 5235:
+/***/ 668:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 
@@ -154,10 +155,8 @@ ClickOutside.install = function (app) {
 /* harmony default export */ const clickoutside = (ClickOutside);
 // EXTERNAL MODULE: ../../node_modules/@babel/runtime/helpers/esm/typeof.js
 var esm_typeof = __webpack_require__(6522);
-;// CONCATENATED MODULE: external "../plugin-popover"
-var x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
-var y = x => () => x
-const plugin_popover_namespaceObject = x({ ["default"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_plugin_popover_300e25d0__["default"] });
+// EXTERNAL MODULE: external "../popover"
+var popover_ = __webpack_require__(563);
 ;// CONCATENATED MODULE: ../../packages/directives/src/ellipsis.ts
 
 /*
@@ -235,7 +234,7 @@ var createInstance = function createInstance(el, binding) {
         onContentMouseenter: handleContentEnter,
         onContentMouseleave: handleContentLeave
       });
-      instance = (0,plugin_popover_namespaceObject["default"])(targetOptions);
+      instance = (0,popover_.$bkPopover)(targetOptions);
     }, 300);
   };
   var handleMouseLeave = function handleMouseLeave() {
@@ -322,9 +321,9 @@ var external_vue_ = __webpack_require__(6609);
 // EXTERNAL MODULE: external "../shared"
 var shared_ = __webpack_require__(9253);
 ;// CONCATENATED MODULE: external "@popperjs/core"
-var core_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
-var core_y = x => () => x
-const core_namespaceObject = core_x({ ["createPopper"]: () => __WEBPACK_EXTERNAL_MODULE__popperjs_core_a5c7319c__.createPopper });
+var x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
+var y = x => () => x
+const core_namespaceObject = x({ ["createPopper"]: () => __WEBPACK_EXTERNAL_MODULE__popperjs_core_a5c7319c__.createPopper });
 ;// CONCATENATED MODULE: ../../packages/directives/src/tooltips.ts
 
 
@@ -390,9 +389,6 @@ var tooltips = {
           hide(el);
         }, 100);
       });
-      el.addEventListener('click', function () {
-        hide(el);
-      });
       popper.addEventListener('mouseleave', function () {
         clearTimeout(delayTimeout);
         hideTimeout = setTimeout(function () {
@@ -406,7 +402,7 @@ var tooltips = {
             show(el);
             clearTimeout(delayTimeout);
           }, opts.delay);
-        } else if (popper.hasAttribute('data-show')) {
+        } else if (!el.contains(event.target) && popper.hasAttribute('data-show')) {
           hide(el);
         }
       });
@@ -1264,6 +1260,15 @@ normalizeWheel.getEventType = function() /*string*/ {
 module.exports = normalizeWheel;
 
 
+/***/ }),
+
+/***/ 563:
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+var x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
+var y = x => () => x
+module.exports = x({ ["$bkPopover"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_popover_9b03f19d__.$bkPopover });
+
 /***/ }),
 
 /***/ 9253:
@@ -1835,8 +1840,8 @@ function _slicedToArray(arr, i) {
 var toConsumableArray = __webpack_require__(7930);
 // EXTERNAL MODULE: ../../node_modules/@babel/runtime/helpers/esm/typeof.js
 var esm_typeof = __webpack_require__(6522);
-// EXTERNAL MODULE: ../../packages/directives/src/index.ts + 8 modules
-var src = __webpack_require__(5235);
+// EXTERNAL MODULE: ../../packages/directives/src/index.ts + 7 modules
+var src = __webpack_require__(668);
 ;// CONCATENATED MODULE: external "../icon"
 var icon_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var icon_y = x => () => x
@@ -2766,7 +2771,7 @@ var formatDateLabels = function () {
 }();
 var clearHours = function clearHours(time) {
   var cloneDate = new Date(time);
-  cloneDate.setHours(0, 0, 0, 0);
+  cloneDate.setHours(23, 59, 59, 999);
   return cloneDate.getTime();
 };
 var isInRange = function isInRange(time, a, b) {
@@ -2787,31 +2792,20 @@ var isInRange = function isInRange(time, a, b) {
     end = _sort2[1];
   return time >= start && time <= end;
 };
-/**
- * firstUpperCase
- *
- * @param {string} str str
- *
- * @return {string} str
- */
-function firstUpperCase(str) {
+var firstUpperCase = function firstUpperCase(str) {
   return str.toString()[0].toUpperCase() + str.toString().slice(1);
-}
+};
 /**
  * 根据 date 设置 h, m, s
- *
- * @param {Date} date date 对象
- * @param {number} h 小时数
- * @param {number} m 分钟数
- * @param {number} s 秒数
- *
- * @return {Date} date 对象
+ * @param date Date对象
+ * @param hms [小时数,分钟数,秒数]
  */
 var mergeDateHMS = function mergeDateHMS(date) {
+  var hms = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [0, 0, 0];
   var newDate = new Date(date.getTime());
-  newDate.setHours(arguments.length <= 1 ? undefined : arguments[1]);
-  newDate.setMinutes(arguments.length <= 2 ? undefined : arguments[2]);
-  newDate.setSeconds(arguments.length <= 3 ? undefined : arguments[3]);
+  newDate.setHours(hms[0]);
+  newDate.setMinutes(hms[1]);
+  newDate.setSeconds(hms[2] - 1);
   return newDate;
 };
 var capitalize = function capitalize(str) {
@@ -3993,10 +3987,13 @@ var timeParts = ['hours', 'minutes', 'seconds'];
     })])]), [[external_vue_.vShow, this.showSeconds]])]);
   }
 }));
+;// CONCATENATED MODULE: external "lodash/cloneDeep"
+var cloneDeep_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
+var cloneDeep_y = x => () => x
+const cloneDeep_namespaceObject = cloneDeep_x({ ["default"]: () => __WEBPACK_EXTERNAL_MODULE_lodash_cloneDeep_13f2b125__["default"] });
 ;// CONCATENATED MODULE: ../../packages/date-picker/src/panel/time.tsx
 
 
-
 function time_ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function time_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? time_ownKeys(Object(t), !0).forEach(function (r) { (0,defineProperty["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : time_ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 /*
@@ -4031,6 +4028,7 @@ function time_objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var
 
 
 
+
 var timeProps = {
   disabledDate: {
     type: Function,
@@ -4094,7 +4092,7 @@ var timeProps = {
     var showSeconds = (0,external_vue_.computed)(function () {
       return !(props.format || '').match(/mm$/);
     });
-    var timeSlots = (0,external_vue_.computed)(function () {
+    var localTimeValues = (0,external_vue_.computed)(function () {
       if (!props.value[0]) {
         return [];
       }
@@ -4113,28 +4111,25 @@ var timeProps = {
         }, {});
         return _disabled;
       }
-      var slots = [24, 60, 60];
+      var HMSMax = [24, 60, 60];
       var disabled = ['Hours', 'Minutes', 'Seconds'].map(function (type) {
-        return props["disabled".concat(type)];
+        return (0,cloneDeep_namespaceObject["default"])(props["disabled".concat(type)]);
       });
-      var disabledHMS = disabled.map(function (preDisabled, j) {
-        var slot = slots[j];
-        var toDisable = preDisabled;
-        var _loop = function _loop(i) {
-          var hms = timeSlots.value.map(function (slot, x) {
-            return x === j ? i : slot;
+      var disabledHMS = disabled.map(function (currentDisable, disableIndex) {
+        var itemMax = HMSMax[disableIndex];
+        var _loop = function _loop(itemIndex) {
+          var hms = localTimeValues.value.map(function (value, index) {
+            return index === disableIndex ? itemIndex : value;
           });
-          var testDateTime = mergeDateHMS.apply(void 0, [state.date].concat((0,toConsumableArray["default"])(hms)));
-          if (props.disabledDate(testDateTime, true)) {
-            toDisable.push(i);
+          var testDateTime = mergeDateHMS(state.date, hms);
+          if (props.disabledDate(testDateTime)) {
+            currentDisable.push(itemIndex);
           }
         };
-        for (var i = 0; i < slot; i += props.steps[j] || 1) {
-          _loop(i);
+        for (var itemIndex = 0; itemIndex < itemMax; itemIndex += props.steps[disableIndex] || 1) {
+          _loop(itemIndex);
         }
-        return toDisable.filter(function (el, i, arr) {
-          return arr.indexOf(el) === i;
-        });
+        return currentDisable;
       });
       return disabledTypes.reduce(function (obj, type, i) {
         obj[type] = disabledHMS[i];
@@ -4176,7 +4171,7 @@ var timeProps = {
     return time_objectSpread(time_objectSpread({}, (0,external_vue_.toRefs)(state)), {}, {
       visibleDate: visibleDate,
       showSeconds: showSeconds,
-      timeSlots: timeSlots,
+      localTimeValues: localTimeValues,
       disabledHMS: disabledHMS,
       timeSpinnerRef: timeSpinnerRef,
       handlePickClick: handlePickClick,
@@ -4205,9 +4200,9 @@ var timeProps = {
       "disabledMinutes": this.disabledHMS.disabledMinutes,
       "disabledSeconds": this.disabledHMS.disabledSeconds,
       "hideDisabledOptions": this.hideDisabledOptions,
-      "hours": this.timeSlots[0],
-      "minutes": this.timeSlots[1],
-      "seconds": this.timeSlots[2],
+      "hours": this.localTimeValues[0],
+      "minutes": this.localTimeValues[1],
+      "seconds": this.localTimeValues[2],
       "showSeconds": this.showSeconds,
       "steps": this.steps,
       "onChange": this.handleChange,

package/lib/date-picker/panel/time.d.ts

@@ -188,7 +188,7 @@ declare const _default: import("vue").DefineComponent<{
 }, {
     visibleDate: import("vue").Ref<any>;
     showSeconds: import("vue").ComputedRef<boolean>;
-    timeSlots: import("vue").ComputedRef<any[]>;
+    localTimeValues: import("vue").ComputedRef<number[]>;
     disabledHMS: import("vue").ComputedRef<IDisabledHMS>;
     timeSpinnerRef: import("vue").Ref<any>;
     handlePickClick: () => void;

package/lib/date-picker/utils.d.ts

@@ -103,23 +103,11 @@ export declare const formatDateLabels: (locale: any, format: any, date: any) =>
 };
 export declare const clearHours: (time: any) => number;
 export declare const isInRange: (time: any, a: any, b: any) => boolean;
-/**
- * firstUpperCase
- *
- * @param {string} str str
- *
- * @return {string} str
- */
-export declare function firstUpperCase(str: any): any;
+export declare const firstUpperCase: (str: string) => string;
 /**
  * 根据 date 设置 h, m, s
- *
- * @param {Date} date date 对象
- * @param {number} h 小时数
- * @param {number} m 分钟数
- * @param {number} s 秒数
- *
- * @return {Date} date 对象
+ * @param date Date对象
+ * @param hms [小时数,分钟数,秒数]
  */
-export declare const mergeDateHMS: (date: any, ...hms: any[]) => Date;
-export declare const capitalize: (str: any) => any;
+export declare const mergeDateHMS: (date: Date, hms?: number[]) => Date;
+export declare const capitalize: (str: string) => string;

package/lib/directives/index.js

@@ -1,7 +1,7 @@
 import "../styles/reset.css";
+import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_popover_9b03f19d__ from "../popover";
 import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_shared_edbdfb03__ from "../shared";
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "vue";
-import * as __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_plugin_popover_300e25d0__ from "../plugin-popover";
 import * as __WEBPACK_EXTERNAL_MODULE__popperjs_core_a5c7319c__ from "@popperjs/core";
 import * as __WEBPACK_EXTERNAL_MODULE__loading_4d683b23__ from "../loading";
 import * as __WEBPACK_EXTERNAL_MODULE__overflow_title_f9bafa47__ from "../overflow-title";
@@ -610,6 +610,15 @@ normalizeWheel.getEventType = function() /*string*/ {
 module.exports = normalizeWheel;
 
 
+/***/ }),
+
+/***/ 563:
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
+
+var x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
+var y = x => () => x
+module.exports = x({ ["$bkPopover"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_popover_9b03f19d__.$bkPopover });
+
 /***/ }),
 
 /***/ 9253:
@@ -1002,10 +1011,8 @@ ClickOutside.install = function (app) {
 /* harmony default export */ const clickoutside = (ClickOutside);
 // EXTERNAL MODULE: ../../node_modules/@babel/runtime/helpers/esm/typeof.js
 var esm_typeof = __webpack_require__(6522);
-;// CONCATENATED MODULE: external "../plugin-popover"
-var x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
-var y = x => () => x
-const plugin_popover_namespaceObject = x({ ["default"]: () => __WEBPACK_EXTERNAL_MODULE_bkui_vue_lib_plugin_popover_300e25d0__["default"] });
+// EXTERNAL MODULE: external "../popover"
+var popover_ = __webpack_require__(563);
 ;// CONCATENATED MODULE: ../../packages/directives/src/ellipsis.ts
 
 /*
@@ -1083,7 +1090,7 @@ var createInstance = function createInstance(el, binding) {
         onContentMouseenter: handleContentEnter,
         onContentMouseleave: handleContentLeave
       });
-      instance = (0,plugin_popover_namespaceObject["default"])(targetOptions);
+      instance = (0,popover_.$bkPopover)(targetOptions);
     }, 300);
   };
   var handleMouseLeave = function handleMouseLeave() {
@@ -1170,9 +1177,9 @@ var external_vue_ = __webpack_require__(6609);
 // EXTERNAL MODULE: external "../shared"
 var shared_ = __webpack_require__(9253);
 ;// CONCATENATED MODULE: external "@popperjs/core"
-var core_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
-var core_y = x => () => x
-const core_namespaceObject = core_x({ ["createPopper"]: () => __WEBPACK_EXTERNAL_MODULE__popperjs_core_a5c7319c__.createPopper });
+var x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
+var y = x => () => x
+const core_namespaceObject = x({ ["createPopper"]: () => __WEBPACK_EXTERNAL_MODULE__popperjs_core_a5c7319c__.createPopper });
 ;// CONCATENATED MODULE: ../../packages/directives/src/tooltips.ts
 
 
@@ -1238,9 +1245,6 @@ var tooltips = {
           hide(el);
         }, 100);
       });
-      el.addEventListener('click', function () {
-        hide(el);
-      });
       popper.addEventListener('mouseleave', function () {
         clearTimeout(delayTimeout);
         hideTimeout = setTimeout(function () {
@@ -1254,7 +1258,7 @@ var tooltips = {
             show(el);
             clearTimeout(delayTimeout);
           }, opts.delay);
-        } else if (popper.hasAttribute('data-show')) {
+        } else if (!el.contains(event.target) && popper.hasAttribute('data-show')) {
           hide(el);
         }
       });

package/lib/dropdown/dropdown.d.ts

@@ -36,6 +36,7 @@ declare const _default: import("vue").DefineComponent<{
         default: string;
     };
 }, {
+    isPopoverShow: import("vue").Ref<boolean>;
     afterShow: () => void;
     afterHidden: () => void;
     popoverRef: import("vue").Ref<any>;

package/lib/dropdown/index.d.ts

@@ -37,6 +37,7 @@ declare const BkDropdown: {
         onHide?: (...args: any[]) => any;
         onShowChange?: (...args: any[]) => any;
     }, {
+        isPopoverShow: import("vue").Ref<boolean>;
         afterShow: () => void;
         afterHidden: () => void;
         popoverRef: import("vue").Ref<any>;
@@ -128,6 +129,7 @@ declare const BkDropdown: {
         onHide?: (...args: any[]) => any;
         onShowChange?: (...args: any[]) => any;
     }, {
+        isPopoverShow: import("vue").Ref<boolean>;
         afterShow: () => void;
         afterHidden: () => void;
         popoverRef: import("vue").Ref<any>;
@@ -181,6 +183,7 @@ declare const BkDropdown: {
     onHide?: (...args: any[]) => any;
     onShowChange?: (...args: any[]) => any;
 }, {
+    isPopoverShow: import("vue").Ref<boolean>;
     afterShow: () => void;
     afterHidden: () => void;
     popoverRef: import("vue").Ref<any>;

package/lib/dropdown/index.js

@@ -90,7 +90,7 @@ function _defineProperty(obj, key, value) {
 ;// CONCATENATED MODULE: external "vue"
 var external_vue_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var external_vue_y = x => () => x
-const external_vue_namespaceObject = external_vue_x({ ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createTextVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createTextVNode, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref });
+const external_vue_namespaceObject = external_vue_x({ ["computed"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.computed, ["createVNode"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.createVNode, ["defineComponent"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.defineComponent, ["mergeProps"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.mergeProps, ["ref"]: () => __WEBPACK_EXTERNAL_MODULE_vue__.ref });
 ;// CONCATENATED MODULE: external "../config-provider"
 var config_provider_x = y => { var x = {}; __webpack_require__.d(x, y); return x; }
 var config_provider_y = x => () => x
@@ -160,8 +160,13 @@ const merge_namespaceObject = merge_x({ ["default"]: () => __WEBPACK_EXTERNAL_MO
   emits: ['showChange', 'show', 'hide'],
   setup: function setup(_props, _ref) {
     var emit = _ref.emit;
+    var popoverRef = (0,external_vue_namespaceObject.ref)(null);
+    var isPopoverShow = (0,external_vue_namespaceObject.ref)(false);
+    var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
+      resolveClassName = _usePrefix.resolveClassName;
     /** 弹层显示值变更 */
     var handleShowChagne = function handleShowChagne(val) {
+      isPopoverShow.value = val;
       emit('showChange', val);
     };
     /** 显示后回调 */
@@ -174,10 +179,8 @@ const merge_namespaceObject = merge_x({ ["default"]: () => __WEBPACK_EXTERNAL_MO
       emit('hide');
       handleShowChagne(false);
     };
-    var popoverRef = (0,external_vue_namespaceObject.ref)(null);
-    var _usePrefix = (0,config_provider_namespaceObject.usePrefix)(),
-      resolveClassName = _usePrefix.resolveClassName;
     return {
+      isPopoverShow: isPopoverShow,
       afterShow: afterShow,
       afterHidden: afterHidden,
       popoverRef: popoverRef,
@@ -209,13 +212,15 @@ const merge_namespaceObject = merge_x({ ["default"]: () => __WEBPACK_EXTERNAL_MO
         var _this$$slots$default, _this$$slots;
         return (0,external_vue_namespaceObject.createVNode)("div", {
           "class": ["".concat(_this.resolveClassName('dropdown-reference')), _this.disabled ? 'disabled' : '']
-        }, [' ', (_this$$slots$default = (_this$$slots = _this.$slots)["default"]) === null || _this$$slots$default === void 0 ? void 0 : _this$$slots$default.call(_this$$slots), ' ']);
+        }, [(_this$$slots$default = (_this$$slots = _this.$slots)["default"]) === null || _this$$slots$default === void 0 ? void 0 : _this$$slots$default.call(_this$$slots, {
+          popoverShow: _this.isPopoverShow
+        })]);
       },
       content: function content() {
         var _this$$slots$content, _this$$slots2;
         return (0,external_vue_namespaceObject.createVNode)("div", {
           "class": "".concat(_this.resolveClassName('dropdown-content'))
-        }, [(0,external_vue_namespaceObject.createTextVNode)(" "), (_this$$slots$content = (_this$$slots2 = _this.$slots).content) === null || _this$$slots$content === void 0 ? void 0 : _this$$slots$content.call(_this$$slots2), (0,external_vue_namespaceObject.createTextVNode)(" ")]);
+        }, [(_this$$slots$content = (_this$$slots2 = _this.$slots).content) === null || _this$$slots$content === void 0 ? void 0 : _this$$slots$content.call(_this$$slots2)]);
       }
     })]);
   }

package/lib/form/form-item.d.ts

@@ -1,5 +1,6 @@
 import type { ComputedRef, ExtractPropTypes } from 'vue';
 declare const formItemProps: {
+    itemType: import("vue-types").VueTypeDef<string>;
     label: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
@@ -38,9 +39,15 @@ declare const formItemProps: {
     errorDisplayType: import("vue-types").VueTypeDef<string> & {
         default: string;
     };
+    errorTipAppendToParent: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
 };
 export type FormItemProps = Readonly<ExtractPropTypes<typeof formItemProps>>;
 declare const _default: import("vue").DefineComponent<{
+    itemType: import("vue-types").VueTypeDef<string>;
     label: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
@@ -79,6 +86,11 @@ declare const _default: import("vue").DefineComponent<{
     errorDisplayType: import("vue-types").VueTypeDef<string> & {
         default: string;
     };
+    errorTipAppendToParent: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
 }, {
     isShowLabel: ComputedRef<boolean>;
     labelStyles: ComputedRef<{
@@ -96,6 +108,7 @@ declare const _default: import("vue").DefineComponent<{
     isError: import("vue").Ref<boolean>;
     errorMessage: import("vue").Ref<string>;
 }, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps, Readonly<ExtractPropTypes<{
+    itemType: import("vue-types").VueTypeDef<string>;
     label: import("vue-types").VueTypeValidableDef<string> & {
         default: string;
     };
@@ -134,6 +147,11 @@ declare const _default: import("vue").DefineComponent<{
     errorDisplayType: import("vue-types").VueTypeDef<string> & {
         default: string;
     };
+    errorTipAppendToParent: import("vue-types").VueTypeValidableDef<boolean> & {
+        default: boolean;
+    } & {
+        default: boolean;
+    };
 }>>, {
     required: boolean;
     label: string;
@@ -145,5 +163,6 @@ declare const _default: import("vue").DefineComponent<{
     maxlength: number;
     rules: unknown[];
     errorDisplayType: string;
+    errorTipAppendToParent: boolean;
 }, {}>;
 export default _default;

package/lib/form/form.css

@@ -19,12 +19,23 @@
   line-height: 20px;
   text-align: left;
 }
-.bk-form--vertical .bk-form-content {
-  text-align: left;
-}
 .bk-form-item {
   margin-bottom: 24px;
 }
+.bk-form-item--vertical .bk-form-label {
+  float: unset;
+  width: auto;
+  padding-right: 0;
+  margin-bottom: 6px;
+  line-height: 20px;
+  text-align: left;
+}
+.bk-form-item--default .bk-form-label {
+  float: left;
+  padding-right: 22px;
+  line-height: 32px;
+  text-align: right;
+}
 .bk-form-item.is-required .bk-form-label:after {
   position: absolute;
   top: 0;
@@ -51,6 +62,7 @@
 }
 .bk-form-label {
   position: relative;
+  box-sizing: border-box;
   float: left;
   padding-right: 22px;
   font-size: 14px;
@@ -59,7 +71,6 @@
   color: #63656e;
   text-align: right;
   vertical-align: middle;
-  box-sizing: border-box;
 }
 .bk-form-label-description {
   cursor: pointer;
@@ -71,6 +82,7 @@
 .bk-form-content {
   position: relative;
   line-height: 32px;
+  text-align: left;
 }
 .bk-form-error {
   position: absolute;

package/lib/form/form.less

@@ -26,16 +26,34 @@
       text-align: left;
 
     }
-
-    .@{bk-prefix}-form-content {
-      text-align: left;
-    }
   }
 }
 
 .@{bk-prefix}-form-item {
   margin-bottom: 24px;
 
+  &--vertical {
+
+    .@{bk-prefix}-form-label {
+      float: unset;
+      width: auto;
+      padding-right: 0;
+      margin-bottom: 6px;
+      line-height: 20px;
+      text-align: left;
+    }
+  }
+
+    &--default {
+
+    .@{bk-prefix}-form-label {
+      float: left;
+      padding-right: 22px;
+      line-height: 32px;
+      text-align: right;
+    }
+  }
+
   &.is-required {
     .@{bk-prefix}-form-label {
       &:after {
@@ -73,6 +91,7 @@
 
 .@{bk-prefix}-form-label {
   position: relative;
+  box-sizing: border-box;
   float: left;
   padding-right: 22px;
   font-size: 14px;
@@ -80,9 +99,7 @@
   line-height: 32px;
   color: #63656e;
   text-align: right;
-  text-align: right;
   vertical-align: middle;
-  box-sizing: border-box;
 }
 .@{bk-prefix}-form-label-description {
   cursor: pointer;
@@ -95,6 +112,7 @@
 .@{bk-prefix}-form-content {
   position: relative;
   line-height: 32px;
+  text-align: left;
 }
 
 .@{bk-prefix}-form-error {

package/lib/form/form.variable.css

@@ -149,12 +149,23 @@
   line-height: 20px;
   text-align: left;
 }
-.bk-form--vertical .bk-form-content {
-  text-align: left;
-}
 .bk-form-item {
   margin-bottom: 24px;
 }
+.bk-form-item--vertical .bk-form-label {
+  float: unset;
+  width: auto;
+  padding-right: 0;
+  margin-bottom: 6px;
+  line-height: 20px;
+  text-align: left;
+}
+.bk-form-item--default .bk-form-label {
+  float: left;
+  padding-right: 22px;
+  line-height: 32px;
+  text-align: right;
+}
 .bk-form-item.is-required .bk-form-label:after {
   position: absolute;
   top: 0;
@@ -181,6 +192,7 @@
 }
 .bk-form-label {
   position: relative;
+  box-sizing: border-box;
   float: left;
   padding-right: 22px;
   font-size: 14px;
@@ -189,7 +201,6 @@
   color: #63656e;
   text-align: right;
   vertical-align: middle;
-  box-sizing: border-box;
 }
 .bk-form-label-description {
   cursor: pointer;
@@ -201,6 +212,7 @@
 .bk-form-content {
   position: relative;
   line-height: 32px;
+  text-align: left;
 }
 .bk-form-error {
   position: absolute;