publish 4.6.0-beta.2
This commit is contained in:
parent
072c992889
commit
3db95d23f9
7 changed files with 23 additions and 23 deletions
24
dist/iview.js
vendored
24
dist/iview.js
vendored
|
@ -21645,12 +21645,12 @@ exports.default = {
|
||||||
default: false
|
default: false
|
||||||
},
|
},
|
||||||
|
|
||||||
overstep: {
|
sticky: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
},
|
},
|
||||||
|
|
||||||
overstepDistance: {
|
stickyDistance: {
|
||||||
type: Number,
|
type: Number,
|
||||||
default: 10
|
default: 10
|
||||||
},
|
},
|
||||||
|
@ -21854,21 +21854,21 @@ exports.default = {
|
||||||
y: distance.y - this.dragData.dragY
|
y: distance.y - this.dragData.dragY
|
||||||
};
|
};
|
||||||
|
|
||||||
if (this.overstep) {
|
if (this.sticky) {
|
||||||
var clientWidth = document.documentElement.clientWidth;
|
var clientWidth = document.documentElement.clientWidth;
|
||||||
var clientHeight = document.documentElement.clientHeight;
|
var clientHeight = document.documentElement.clientHeight;
|
||||||
|
|
||||||
if (this.dragData.x + diff_distance.x <= this.overstepDistance && diff_distance.x < 0) {
|
if (this.dragData.x + diff_distance.x <= this.stickyDistance && diff_distance.x < 0) {
|
||||||
this.dragData.x = 0;
|
this.dragData.x = 0;
|
||||||
} else if (this.dragData.x + this.dragData.rect.width - clientWidth > -this.overstepDistance && diff_distance.x > 0) {
|
} else if (this.dragData.x + this.dragData.rect.width - clientWidth > -this.stickyDistance && diff_distance.x > 0) {
|
||||||
this.dragData.x = clientWidth - this.dragData.rect.width;
|
this.dragData.x = clientWidth - this.dragData.rect.width;
|
||||||
} else {
|
} else {
|
||||||
this.dragData.x += diff_distance.x;
|
this.dragData.x += diff_distance.x;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.dragData.y + diff_distance.y <= this.overstepDistance && diff_distance.y < 0) {
|
if (this.dragData.y + diff_distance.y <= this.stickyDistance && diff_distance.y < 0) {
|
||||||
this.dragData.y = 0;
|
this.dragData.y = 0;
|
||||||
} else if (this.dragData.y + this.dragData.rect.height - clientHeight > -this.overstepDistance && diff_distance.y > 0) {
|
} else if (this.dragData.y + this.dragData.rect.height - clientHeight > -this.stickyDistance && diff_distance.y > 0) {
|
||||||
this.dragData.y = clientHeight - this.dragData.rect.height;
|
this.dragData.y = clientHeight - this.dragData.rect.height;
|
||||||
} else {
|
} else {
|
||||||
this.dragData.y += diff_distance.y;
|
this.dragData.y += diff_distance.y;
|
||||||
|
@ -30772,7 +30772,7 @@ if (typeof window !== 'undefined' && window.Vue) {
|
||||||
}
|
}
|
||||||
|
|
||||||
var API = (0, _extends3.default)({
|
var API = (0, _extends3.default)({
|
||||||
version: '4.6.0-beta.1',
|
version: '4.6.0-beta.2',
|
||||||
locale: _index2.default.use,
|
locale: _index2.default.use,
|
||||||
i18n: _index2.default.i18n,
|
i18n: _index2.default.i18n,
|
||||||
install: install,
|
install: install,
|
||||||
|
@ -40573,8 +40573,8 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
|
||||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_modal_vue__ = __webpack_require__(216);
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_modal_vue__ = __webpack_require__(216);
|
||||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_modal_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_modal_vue__);
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_modal_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_modal_vue__);
|
||||||
/* harmony namespace reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_modal_vue__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_modal_vue__[key]; }) }(__WEBPACK_IMPORT_KEY__));
|
/* harmony namespace reexport (unknown) */ for(var __WEBPACK_IMPORT_KEY__ in __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_modal_vue__) if(__WEBPACK_IMPORT_KEY__ !== 'default') (function(key) { __webpack_require__.d(__webpack_exports__, key, function() { return __WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_modal_vue__[key]; }) }(__WEBPACK_IMPORT_KEY__));
|
||||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__babel_loader_sourceMap_node_modules_vue_loader_lib_template_compiler_index_id_data_v_c5e21e2e_hasScoped_false_optionsId_0_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_modal_vue__ = __webpack_require__(505);
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__babel_loader_sourceMap_node_modules_vue_loader_lib_template_compiler_index_id_data_v_3aa0bea4_hasScoped_false_optionsId_0_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_modal_vue__ = __webpack_require__(505);
|
||||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__babel_loader_sourceMap_node_modules_vue_loader_lib_template_compiler_index_id_data_v_c5e21e2e_hasScoped_false_optionsId_0_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_modal_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1__babel_loader_sourceMap_node_modules_vue_loader_lib_template_compiler_index_id_data_v_c5e21e2e_hasScoped_false_optionsId_0_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_modal_vue__);
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1__babel_loader_sourceMap_node_modules_vue_loader_lib_template_compiler_index_id_data_v_3aa0bea4_hasScoped_false_optionsId_0_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_modal_vue___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1__babel_loader_sourceMap_node_modules_vue_loader_lib_template_compiler_index_id_data_v_3aa0bea4_hasScoped_false_optionsId_0_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_modal_vue__);
|
||||||
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__node_modules_vue_loader_lib_runtime_component_normalizer__ = __webpack_require__(0);
|
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2__node_modules_vue_loader_lib_runtime_component_normalizer__ = __webpack_require__(0);
|
||||||
/* script */
|
/* script */
|
||||||
|
|
||||||
|
@ -40592,8 +40592,8 @@ var __vue_module_identifier__ = null
|
||||||
|
|
||||||
var Component = Object(__WEBPACK_IMPORTED_MODULE_2__node_modules_vue_loader_lib_runtime_component_normalizer__["a" /* default */])(
|
var Component = Object(__WEBPACK_IMPORTED_MODULE_2__node_modules_vue_loader_lib_runtime_component_normalizer__["a" /* default */])(
|
||||||
__WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_modal_vue___default.a,
|
__WEBPACK_IMPORTED_MODULE_0__babel_loader_node_modules_vue_loader_lib_selector_type_script_index_0_modal_vue___default.a,
|
||||||
__WEBPACK_IMPORTED_MODULE_1__babel_loader_sourceMap_node_modules_vue_loader_lib_template_compiler_index_id_data_v_c5e21e2e_hasScoped_false_optionsId_0_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_modal_vue__["render"],
|
__WEBPACK_IMPORTED_MODULE_1__babel_loader_sourceMap_node_modules_vue_loader_lib_template_compiler_index_id_data_v_3aa0bea4_hasScoped_false_optionsId_0_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_modal_vue__["render"],
|
||||||
__WEBPACK_IMPORTED_MODULE_1__babel_loader_sourceMap_node_modules_vue_loader_lib_template_compiler_index_id_data_v_c5e21e2e_hasScoped_false_optionsId_0_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_modal_vue__["staticRenderFns"],
|
__WEBPACK_IMPORTED_MODULE_1__babel_loader_sourceMap_node_modules_vue_loader_lib_template_compiler_index_id_data_v_3aa0bea4_hasScoped_false_optionsId_0_buble_transforms_node_modules_vue_loader_lib_selector_type_template_index_0_modal_vue__["staticRenderFns"],
|
||||||
__vue_template_functional__,
|
__vue_template_functional__,
|
||||||
__vue_styles__,
|
__vue_styles__,
|
||||||
__vue_scopeId__,
|
__vue_scopeId__,
|
||||||
|
|
2
dist/iview.js.map
vendored
2
dist/iview.js.map
vendored
File diff suppressed because one or more lines are too long
2
dist/iview.min.js
vendored
2
dist/iview.min.js
vendored
File diff suppressed because one or more lines are too long
BIN
dist/iview.min.js.gz
vendored
BIN
dist/iview.min.js.gz
vendored
Binary file not shown.
2
dist/iview.min.js.map
vendored
2
dist/iview.min.js.map
vendored
File diff suppressed because one or more lines are too long
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "view-design",
|
"name": "view-design",
|
||||||
"version": "4.6.0-beta.1",
|
"version": "4.6.0-beta.2",
|
||||||
"title": "ViewUI",
|
"title": "ViewUI",
|
||||||
"description": "A high quality UI components Library with Vue.js",
|
"description": "A high quality UI components Library with Vue.js",
|
||||||
"homepage": "http://www.iviewui.com",
|
"homepage": "http://www.iviewui.com",
|
||||||
|
|
|
@ -124,12 +124,12 @@
|
||||||
default: false
|
default: false
|
||||||
},
|
},
|
||||||
// 4.6.0
|
// 4.6.0
|
||||||
overstep: {
|
sticky: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
default: false
|
default: false
|
||||||
},
|
},
|
||||||
// 4.6.0
|
// 4.6.0
|
||||||
overstepDistance: {
|
stickyDistance: {
|
||||||
type: Number,
|
type: Number,
|
||||||
default: 10
|
default: 10
|
||||||
},
|
},
|
||||||
|
@ -339,21 +339,21 @@
|
||||||
y: distance.y - this.dragData.dragY
|
y: distance.y - this.dragData.dragY
|
||||||
};
|
};
|
||||||
|
|
||||||
if (this.overstep) {
|
if (this.sticky) {
|
||||||
const clientWidth = document.documentElement.clientWidth;
|
const clientWidth = document.documentElement.clientWidth;
|
||||||
const clientHeight = document.documentElement.clientHeight;
|
const clientHeight = document.documentElement.clientHeight;
|
||||||
|
|
||||||
if ((this.dragData.x + diff_distance.x <= this.overstepDistance) && diff_distance.x < 0) {
|
if ((this.dragData.x + diff_distance.x <= this.stickyDistance) && diff_distance.x < 0) {
|
||||||
this.dragData.x = 0;
|
this.dragData.x = 0;
|
||||||
} else if ((this.dragData.x + this.dragData.rect.width - clientWidth > -this.overstepDistance) && diff_distance.x > 0) {
|
} else if ((this.dragData.x + this.dragData.rect.width - clientWidth > -this.stickyDistance) && diff_distance.x > 0) {
|
||||||
this.dragData.x = clientWidth - this.dragData.rect.width;
|
this.dragData.x = clientWidth - this.dragData.rect.width;
|
||||||
} else {
|
} else {
|
||||||
this.dragData.x += diff_distance.x;
|
this.dragData.x += diff_distance.x;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((this.dragData.y + diff_distance.y <= this.overstepDistance) && diff_distance.y < 0) {
|
if ((this.dragData.y + diff_distance.y <= this.stickyDistance) && diff_distance.y < 0) {
|
||||||
this.dragData.y = 0;
|
this.dragData.y = 0;
|
||||||
} else if ((this.dragData.y + this.dragData.rect.height - clientHeight > -this.overstepDistance) && diff_distance.y > 0) {
|
} else if ((this.dragData.y + this.dragData.rect.height - clientHeight > -this.stickyDistance) && diff_distance.y > 0) {
|
||||||
this.dragData.y = clientHeight - this.dragData.rect.height;
|
this.dragData.y = clientHeight - this.dragData.rect.height;
|
||||||
} else {
|
} else {
|
||||||
this.dragData.y += diff_distance.y;
|
this.dragData.y += diff_distance.y;
|
||||||
|
|
Loading…
Add table
Reference in a new issue