Skip to content

Commit fa0c3a3

Browse files
dolymooddolymood
committed
build: package
1 parent ffb936c commit fa0c3a3

File tree

14 files changed

+147
-37
lines changed

14 files changed

+147
-37
lines changed

‎lib/cascade-picker/cascade-picker.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/cascade-picker/index.js‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6703,7 +6703,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
67036703
});
67046704
var DEFAULT_KEYS = {
67056705
value: 'value',
6706-
text: 'text'
6706+
text: 'text',
6707+
order: 'order'
67076708
};
67086709

67096710
exports.default = {
@@ -6734,6 +6735,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
67346735
textKey: function textKey() {
67356736
return this.alias.text || DEFAULT_KEYS.text;
67366737
},
6738+
orderKey: function orderKey() {
6739+
return DEFAULT_KEYS.order;
6740+
},
67376741
merge: function merge() {
67386742
return [this.data, this.selectedIndex];
67396743
}
@@ -7191,6 +7195,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
71917195
return !this.pending && this.wheels.every(function (wheel) {
71927196
return !wheel.isInTransition;
71937197
});
7198+
},
7199+
_getFlexOrder: function _getFlexOrder(data) {
7200+
if (data[0]) {
7201+
return data[0][this.orderKey];
7202+
}
7203+
return 0;
71947204
}
71957205
},
71967206
beforeDestroy: function beforeDestroy() {
@@ -7287,7 +7297,10 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
72877297
staticClass: "cube-picker-wheel-wrapper"
72887298
}, _vm._l((_vm.finalData), function(data, index) {
72897299
return _c('div', {
7290-
key: index
7300+
key: index,
7301+
style: ({
7302+
order: _vm._getFlexOrder(data)
7303+
})
72917304
}, [_c('ul', {
72927305
staticClass: "cube-picker-wheel-scroll"
72937306
}, _vm._l((data), function(item, index) {
@@ -7485,7 +7498,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
74857498
data.forEach(function (item) {
74867499
columnData.push({
74877500
value: item[_this.valueKey],
7488-
text: item[_this.textKey]
7501+
text: item[_this.textKey],
7502+
order: item[_this.orderKey]
74897503
});
74907504
});
74917505
_this.pickerData[i] = columnData;

‎lib/cube.min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/date-picker/date-picker.min.js‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/date-picker/index.js‎

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6764,7 +6764,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
67646764
});
67656765
var DEFAULT_KEYS = {
67666766
value: 'value',
6767-
text: 'text'
6767+
text: 'text',
6768+
order: 'order'
67686769
};
67696770

67706771
exports.default = {
@@ -6795,6 +6796,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
67956796
textKey: function textKey() {
67966797
return this.alias.text || DEFAULT_KEYS.text;
67976798
},
6799+
orderKey: function orderKey() {
6800+
return DEFAULT_KEYS.order;
6801+
},
67986802
merge: function merge() {
67996803
return [this.data, this.selectedIndex];
68006804
}
@@ -7252,6 +7256,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
72527256
return !this.pending && this.wheels.every(function (wheel) {
72537257
return !wheel.isInTransition;
72547258
});
7259+
},
7260+
_getFlexOrder: function _getFlexOrder(data) {
7261+
if (data[0]) {
7262+
return data[0][this.orderKey];
7263+
}
7264+
return 0;
72557265
}
72567266
},
72577267
beforeDestroy: function beforeDestroy() {
@@ -7348,7 +7358,10 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
73487358
staticClass: "cube-picker-wheel-wrapper"
73497359
}, _vm._l((_vm.finalData), function(data, index) {
73507360
return _c('div', {
7351-
key: index
7361+
key: index,
7362+
style: ({
7363+
order: _vm._getFlexOrder(data)
7364+
})
73527365
}, [_c('ul', {
73537366
staticClass: "cube-picker-wheel-scroll"
73547367
}, _vm._l((data), function(item, index) {
@@ -7546,7 +7559,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
75467559
data.forEach(function (item) {
75477560
columnData.push({
75487561
value: item[_this.valueKey],
7549-
text: item[_this.textKey]
7562+
text: item[_this.textKey],
7563+
order: item[_this.orderKey]
75507564
});
75517565
});
75527566
_this.pickerData[i] = columnData;
@@ -8021,6 +8035,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
80218035
default: function _default() {
80228036
return this.min;
80238037
}
8038+
},
8039+
columnOrder: {
8040+
type: Array,
8041+
default: function _default() {
8042+
return ['year', 'month', 'date', 'hour', 'minute', 'second'];
8043+
}
80248044
}
80258045
},
80268046
computed: {
@@ -8153,7 +8173,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
81538173
for (var i = min; i <= max; i++) {
81548174
var object = {
81558175
text: (0, _date.formatType)(type, format, i, 'i'),
8156-
value: i
8176+
value: i,
8177+
order: this.columnOrder.indexOf(type)
81578178
};
81588179

81598180
if (fatherIsMin && i === min) object.isMin = true;

‎lib/index.js‎

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6241,7 +6241,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
62416241
});
62426242
var DEFAULT_KEYS = {
62436243
value: 'value',
6244-
text: 'text'
6244+
text: 'text',
6245+
order: 'order'
62456246
};
62466247

62476248
exports.default = {
@@ -6272,6 +6273,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
62726273
textKey: function textKey() {
62736274
return this.alias.text || DEFAULT_KEYS.text;
62746275
},
6276+
orderKey: function orderKey() {
6277+
return DEFAULT_KEYS.order;
6278+
},
62756279
merge: function merge() {
62766280
return [this.data, this.selectedIndex];
62776281
}
@@ -6907,7 +6911,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
69076911
}
69086912

69096913
var Cube = {
6910-
version: "1.12.13",
6914+
version: "1.12.14",
69116915
install: install,
69126916
BScroll: _module.BetterScroll,
69136917
createAPI: _module.createAPI
@@ -11630,6 +11634,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
1163011634
return !this.pending && this.wheels.every(function (wheel) {
1163111635
return !wheel.isInTransition;
1163211636
});
11637+
},
11638+
_getFlexOrder: function _getFlexOrder(data) {
11639+
if (data[0]) {
11640+
return data[0][this.orderKey];
11641+
}
11642+
return 0;
1163311643
}
1163411644
},
1163511645
beforeDestroy: function beforeDestroy() {
@@ -12010,7 +12020,10 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
1201012020
staticClass: "cube-picker-wheel-wrapper"
1201112021
}, _vm._l((_vm.finalData), function(data, index) {
1201212022
return _c('div', {
12013-
key: index
12023+
key: index,
12024+
style: ({
12025+
order: _vm._getFlexOrder(data)
12026+
})
1201412027
}, [_c('ul', {
1201512028
staticClass: "cube-picker-wheel-scroll"
1201612029
}, _vm._l((data), function(item, index) {
@@ -16037,7 +16050,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
1603716050
data.forEach(function (item) {
1603816051
columnData.push({
1603916052
value: item[_this.valueKey],
16040-
text: item[_this.textKey]
16053+
text: item[_this.textKey],
16054+
order: item[_this.orderKey]
1604116055
});
1604216056
});
1604316057
_this.pickerData[i] = columnData;
@@ -16347,6 +16361,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
1634716361
default: function _default() {
1634816362
return this.min;
1634916363
}
16364+
},
16365+
columnOrder: {
16366+
type: Array,
16367+
default: function _default() {
16368+
return ['year', 'month', 'date', 'hour', 'minute', 'second'];
16369+
}
1635016370
}
1635116371
},
1635216372
computed: {
@@ -16479,7 +16499,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
1647916499
for (var i = min; i <= max; i++) {
1648016500
var object = {
1648116501
text: (0, _date.formatType)(type, format, i, 'i'),
16482-
value: i
16502+
value: i,
16503+
order: this.columnOrder.indexOf(type)
1648316504
};
1648416505

1648516506
if (fatherIsMin && i === min) object.isMin = true;

‎lib/picker/index.js‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6703,7 +6703,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
67036703
});
67046704
var DEFAULT_KEYS = {
67056705
value: 'value',
6706-
text: 'text'
6706+
text: 'text',
6707+
order: 'order'
67076708
};
67086709

67096710
exports.default = {
@@ -6734,6 +6735,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
67346735
textKey: function textKey() {
67356736
return this.alias.text || DEFAULT_KEYS.text;
67366737
},
6738+
orderKey: function orderKey() {
6739+
return DEFAULT_KEYS.order;
6740+
},
67376741
merge: function merge() {
67386742
return [this.data, this.selectedIndex];
67396743
}
@@ -7191,6 +7195,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
71917195
return !this.pending && this.wheels.every(function (wheel) {
71927196
return !wheel.isInTransition;
71937197
});
7198+
},
7199+
_getFlexOrder: function _getFlexOrder(data) {
7200+
if (data[0]) {
7201+
return data[0][this.orderKey];
7202+
}
7203+
return 0;
71947204
}
71957205
},
71967206
beforeDestroy: function beforeDestroy() {
@@ -7287,7 +7297,10 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
72877297
staticClass: "cube-picker-wheel-wrapper"
72887298
}, _vm._l((_vm.finalData), function(data, index) {
72897299
return _c('div', {
7290-
key: index
7300+
key: index,
7301+
style: ({
7302+
order: _vm._getFlexOrder(data)
7303+
})
72917304
}, [_c('ul', {
72927305
staticClass: "cube-picker-wheel-scroll"
72937306
}, _vm._l((data), function(item, index) {

‎lib/picker/picker.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/segment-picker/index.js‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6703,7 +6703,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
67036703
});
67046704
var DEFAULT_KEYS = {
67056705
value: 'value',
6706-
text: 'text'
6706+
text: 'text',
6707+
order: 'order'
67076708
};
67086709

67096710
exports.default = {
@@ -6734,6 +6735,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
67346735
textKey: function textKey() {
67356736
return this.alias.text || DEFAULT_KEYS.text;
67366737
},
6738+
orderKey: function orderKey() {
6739+
return DEFAULT_KEYS.order;
6740+
},
67376741
merge: function merge() {
67386742
return [this.data, this.selectedIndex];
67396743
}
@@ -7191,6 +7195,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
71917195
return !this.pending && this.wheels.every(function (wheel) {
71927196
return !wheel.isInTransition;
71937197
});
7198+
},
7199+
_getFlexOrder: function _getFlexOrder(data) {
7200+
if (data[0]) {
7201+
return data[0][this.orderKey];
7202+
}
7203+
return 0;
71947204
}
71957205
},
71967206
beforeDestroy: function beforeDestroy() {
@@ -7287,7 +7297,10 @@ module.exports={render:function (){var _vm=this;var _h=_vm.$createElement;var _c
72877297
staticClass: "cube-picker-wheel-wrapper"
72887298
}, _vm._l((_vm.finalData), function(data, index) {
72897299
return _c('div', {
7290-
key: index
7300+
key: index,
7301+
style: ({
7302+
order: _vm._getFlexOrder(data)
7303+
})
72917304
}, [_c('ul', {
72927305
staticClass: "cube-picker-wheel-scroll"
72937306
}, _vm._l((data), function(item, index) {
@@ -7485,7 +7498,8 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
74857498
data.forEach(function (item) {
74867499
columnData.push({
74877500
value: item[_this.valueKey],
7488-
text: item[_this.textKey]
7501+
text: item[_this.textKey],
7502+
order: item[_this.orderKey]
74897503
});
74907504
});
74917505
_this.pickerData[i] = columnData;

‎lib/segment-picker/segment-picker.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)