eoss-mobiles 0.2.17 → 0.2.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/eoss-mobile.common.js +17 -13
- package/lib/index.js +1 -1
- package/lib/selector.js +16 -12
- package/package.json +1 -1
- package/packages/selector/src/selector-tree.vue +8 -5
- package/src/index.js +1 -1
package/lib/selector.js
CHANGED
|
@@ -2153,8 +2153,8 @@ render._withStripped = true
|
|
|
2153
2153
|
|
|
2154
2154
|
// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=73ff2f1c&
|
|
2155
2155
|
|
|
2156
|
-
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=
|
|
2157
|
-
var
|
|
2156
|
+
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-tree.vue?vue&type=template&id=389241ee&
|
|
2157
|
+
var selector_treevue_type_template_id_389241ee_render = function () {
|
|
2158
2158
|
var _vm = this
|
|
2159
2159
|
var _h = _vm.$createElement
|
|
2160
2160
|
var _c = _vm._self._c || _h
|
|
@@ -2278,11 +2278,11 @@ var selector_treevue_type_template_id_5a28bb17_render = function () {
|
|
|
2278
2278
|
{ staticClass: "select-list" },
|
|
2279
2279
|
_vm._l(_vm.list, function (r, i) {
|
|
2280
2280
|
return _c("div", { key: i, staticClass: "item" }, [
|
|
2281
|
-
r[_vm.labelKey]
|
|
2281
|
+
r[_vm.labelKey] || r["showname"]
|
|
2282
2282
|
? _c("div", { staticClass: "name" }, [
|
|
2283
2283
|
_vm._v(
|
|
2284
2284
|
"\n " +
|
|
2285
|
-
_vm._s(r[_vm.labelKey]) +
|
|
2285
|
+
_vm._s(r[_vm.labelKey] || r["showname"]) +
|
|
2286
2286
|
"\n "
|
|
2287
2287
|
),
|
|
2288
2288
|
])
|
|
@@ -2318,11 +2318,11 @@ var selector_treevue_type_template_id_5a28bb17_render = function () {
|
|
|
2318
2318
|
1
|
|
2319
2319
|
)
|
|
2320
2320
|
}
|
|
2321
|
-
var
|
|
2322
|
-
|
|
2321
|
+
var selector_treevue_type_template_id_389241ee_staticRenderFns = []
|
|
2322
|
+
selector_treevue_type_template_id_389241ee_render._withStripped = true
|
|
2323
2323
|
|
|
2324
2324
|
|
|
2325
|
-
// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=
|
|
2325
|
+
// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=389241ee&
|
|
2326
2326
|
|
|
2327
2327
|
// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/tree.vue?vue&type=template&id=491fd81b&
|
|
2328
2328
|
var treevue_type_template_id_491fd81b_render = function () {
|
|
@@ -3440,7 +3440,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
|
|
3440
3440
|
var _this2 = this;
|
|
3441
3441
|
|
|
3442
3442
|
typeof this.selectList != 'string' && (this.list = util["a" /* default */].deepClone(this.selectList));
|
|
3443
|
-
|
|
3443
|
+
|
|
3444
3444
|
this.$nextTick(function () {
|
|
3445
3445
|
if (_this2.nodeList) {
|
|
3446
3446
|
_this2.getNodeList();
|
|
@@ -3579,8 +3579,13 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
|
|
3579
3579
|
overlay: true,
|
|
3580
3580
|
duration: 0
|
|
3581
3581
|
});
|
|
3582
|
+
this.newParam = JSON.parse(JSON.stringify(this.param));
|
|
3582
3583
|
this.newParam.selecttype = this.newTabs[this.selectIndex].param.selecttype;
|
|
3583
|
-
if (this.newParam.selecttype === 'persongroup')
|
|
3584
|
+
if (this.newParam.selecttype === 'persongroup') {
|
|
3585
|
+
this.newParam.pid = 'root';
|
|
3586
|
+
} else {
|
|
3587
|
+
this.newParam.pid = this.param.pid || 'root';
|
|
3588
|
+
}
|
|
3584
3589
|
Object(http["a" /* default */])({
|
|
3585
3590
|
url: this.url ? this.url : this.baseUrl ? this.baseUrl + api["n" /* selectObject */] : api["n" /* selectObject */],
|
|
3586
3591
|
params: _extends({
|
|
@@ -3601,7 +3606,6 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
|
|
3601
3606
|
_this6.$emit('update:selectList', _this6.list);
|
|
3602
3607
|
}
|
|
3603
3608
|
_this6.personnel = res.results;
|
|
3604
|
-
console.log(_this6.personnel, 'this.personnel');
|
|
3605
3609
|
var _this = _this6;
|
|
3606
3610
|
_this6.list.filter(function (r) {
|
|
3607
3611
|
_this.personnel.find(function (i) {
|
|
@@ -3807,8 +3811,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
|
|
|
3807
3811
|
|
|
3808
3812
|
var selector_tree_component = Object(componentNormalizer["a" /* default */])(
|
|
3809
3813
|
src_selector_treevue_type_script_lang_js_,
|
|
3810
|
-
|
|
3811
|
-
|
|
3814
|
+
selector_treevue_type_template_id_389241ee_render,
|
|
3815
|
+
selector_treevue_type_template_id_389241ee_staticRenderFns,
|
|
3812
3816
|
false,
|
|
3813
3817
|
null,
|
|
3814
3818
|
null,
|
package/package.json
CHANGED
|
@@ -68,8 +68,8 @@
|
|
|
68
68
|
<!-- r[labelKey].length > 6
|
|
69
69
|
? r[labelKey].slice(0, 6) + '...'
|
|
70
70
|
: r[labelKey] -->
|
|
71
|
-
<div class="name" v-if="r[labelKey]">
|
|
72
|
-
{{ r[labelKey] }}
|
|
71
|
+
<div class="name" v-if="r[labelKey] || r['showname']">
|
|
72
|
+
{{ r[labelKey] || r['showname'] }}
|
|
73
73
|
</div>
|
|
74
74
|
<div class="delte" @click="delteList(i)">
|
|
75
75
|
<img
|
|
@@ -528,7 +528,7 @@ export default {
|
|
|
528
528
|
mounted() {
|
|
529
529
|
typeof this.selectList != 'string' &&
|
|
530
530
|
(this.list = $.deepClone(this.selectList));
|
|
531
|
-
|
|
531
|
+
|
|
532
532
|
this.$nextTick(() => {
|
|
533
533
|
if (this.nodeList) {
|
|
534
534
|
this.getNodeList();
|
|
@@ -654,11 +654,15 @@ export default {
|
|
|
654
654
|
overlay: true,
|
|
655
655
|
duration: 0
|
|
656
656
|
});
|
|
657
|
+
this.newParam = JSON.parse(JSON.stringify(this.param));
|
|
657
658
|
this.newParam.selecttype = this.newTabs[
|
|
658
659
|
this.selectIndex
|
|
659
660
|
].param.selecttype;
|
|
660
|
-
if (this.newParam.selecttype === 'persongroup')
|
|
661
|
+
if (this.newParam.selecttype === 'persongroup') {
|
|
661
662
|
this.newParam.pid = 'root';
|
|
663
|
+
}else{
|
|
664
|
+
this.newParam.pid = this.param.pid || 'root'
|
|
665
|
+
}
|
|
662
666
|
request({
|
|
663
667
|
url: this.url
|
|
664
668
|
? this.url
|
|
@@ -682,7 +686,6 @@ export default {
|
|
|
682
686
|
this.$emit('update:selectList', this.list);
|
|
683
687
|
}
|
|
684
688
|
this.personnel = res.results;
|
|
685
|
-
console.log(this.personnel, 'this.personnel');
|
|
686
689
|
let _this = this;
|
|
687
690
|
this.list.filter(r => {
|
|
688
691
|
_this.personnel.find(i => {
|