eoss-mobiles 0.2.3 → 0.2.5

package/lib/selector.js

@@ -1952,7 +1952,7 @@ module.exports = require("sm-crypto");
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=5a850d32&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/main.vue?vue&type=template&id=73ff2f1c&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -1975,7 +1975,7 @@ var render = function () {
             )
           )
         : _vm._t("input", null, { click: _vm.handleSelector }),
-      _vm.showSelectorTree || _vm.showTree
+      (_vm.showSelectorTree || _vm.showTree) && typeof _vm.value !== "string"
         ? _c(
             "em-selector-tree",
             _vm._g(
@@ -2016,6 +2016,66 @@ var render = function () {
             )
           )
         : _vm._e(),
+      typeof _vm.value === "string"
+        ? _c(
+            "div",
+            [
+              _c(
+                "em-selector-tree",
+                _vm._g(
+                  _vm._b(
+                    {
+                      directives: [
+                        {
+                          name: "show",
+                          rawName: "v-show",
+                          value: _vm.showSelectorTree || _vm.showTree,
+                          expression: "showSelectorTree || showTree",
+                        },
+                      ],
+                      attrs: {
+                        showTree: _vm.showTree,
+                        isTreeIcon: _vm.$scopedSlots["tree-icon"] != undefined,
+                        selectList: _vm.selectList,
+                      },
+                      on: {
+                        "update:selectList": function ($event) {
+                          _vm.selectList = $event
+                        },
+                        dispose: _vm.handleDispose,
+                        close: function ($event) {
+                          _vm.handleDispose()
+                        },
+                      },
+                      scopedSlots: _vm._u([
+                        {
+                          key: "tree-icon",
+                          fn: function (ref) {
+                            var value = ref.value
+                            return _vm.$scopedSlots["tree-icon"]
+                              ? [
+                                  _vm.$scopedSlots["tree-icon"]
+                                    ? _vm._t("tree-icon", null, {
+                                        value: value,
+                                      })
+                                    : _vm._e(),
+                                ]
+                              : undefined
+                          },
+                        },
+                      ]),
+                    },
+                    "em-selector-tree",
+                    _vm.$attrs,
+                    false
+                  ),
+                  _vm.$listeners
+                )
+              ),
+            ],
+            1
+          )
+        : _vm._e(),
     ],
     2
   )
@@ -2024,10 +2084,10 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=5a850d32&
+// CONCATENATED MODULE: ./packages/selector/src/main.vue?vue&type=template&id=73ff2f1c&
 
-// 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=342bbb9c&
-var selector_treevue_type_template_id_342bbb9c_render = function () {
+// 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=50a2b4fd&
+var selector_treevue_type_template_id_50a2b4fd_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -2190,11 +2250,11 @@ var selector_treevue_type_template_id_342bbb9c_render = function () {
     1
   )
 }
-var selector_treevue_type_template_id_342bbb9c_staticRenderFns = []
-selector_treevue_type_template_id_342bbb9c_render._withStripped = true
+var selector_treevue_type_template_id_50a2b4fd_staticRenderFns = []
+selector_treevue_type_template_id_50a2b4fd_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=342bbb9c&
+// CONCATENATED MODULE: ./packages/selector/src/selector-tree.vue?vue&type=template&id=50a2b4fd&
 
 // 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=bacc904e&
 var treevue_type_template_id_bacc904e_render = function () {
@@ -2882,7 +2942,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       default: true
     },
     selectList: {
-      type: Array, //传入选中数组
+      type: [Array, String], //传入选中数组
       default: function _default() {
         return [];
       }
@@ -2996,6 +3056,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
       label: '',
       namelike: undefined, //搜索关键字
       list: [], //选中数组
+      selectData: [],
       timer: null,
       isSearch: false,
       newParam: {},
@@ -3019,6 +3080,27 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         }
       },
 
+      deep: true,
+      immediate: true
+    },
+    selectList: {
+      handler: function handler(val) {
+        typeof this.selectList != 'string' && (this.list = util["a" /* default */].deepClone(val));
+        if (this.personnel.length == 0) {
+          if (this.nodeList) {
+            this.getNodeList();
+          } else {
+            this.getContent();
+          }
+        } else {
+          if (typeof this.selectList == 'string') {
+            this.selectData = [];
+            this.list = this.getSelectData(this.personnel);
+            this.$emit('update:selectList', this.list);
+          }
+        }
+      },
+
       deep: true,
       immediate: true
     }
@@ -3287,7 +3369,7 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
   mounted: function mounted() {
     var _this2 = this;
 
-    this.list = util["a" /* default */].deepClone(this.selectList);
+    typeof this.selectList != 'string' && (this.list = util["a" /* default */].deepClone(this.selectList));
     this.newParam = this.param;
     this.$nextTick(function () {
       if (_this2.nodeList) {
@@ -3442,6 +3524,11 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
             msg = res.msg;
 
         if (rCode == 0) {
+          if (typeof _this6.selectList == 'string') {
+            _this6.selectData = [];
+            _this6.list = _this6.getSelectData(res.results);
+            _this6.$emit('update:selectList', _this6.list);
+          }
           _this6.personnel = res.results;
           var _this = _this6;
           _this6.list.filter(function (r) {
@@ -3457,9 +3544,25 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         }
       });
     },
-    getData: function getData(obj) {
+    getSelectData: function getSelectData(data) {
       var _this7 = this;
 
+      var _this = this;
+      var user = this.selectList.split(',');
+      user.map(function (x) {
+        data.map(function (i) {
+          if (i[_this.valueKey] == x) {
+            _this7.selectData.push(i);
+          } else if (i.children) {
+            _this.getSelectData(i.children);
+          }
+        });
+      });
+      return this.selectData;
+    },
+    getData: function getData(obj) {
+      var _this8 = this;
+
       var params = _extends({}, this.newParam, {
         pid: obj[this.valueKey],
         selecttype: obj.selecttype,
@@ -3477,9 +3580,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
         params: params
       }).then(function (res) {
         if (res.rCode == 0) {
-          _this7.$set(obj, 'children', res.results);
-          var _this = _this7;
-          _this7.selectList.filter(function (r) {
+          _this8.$set(obj, 'children', res.results);
+          var _this = _this8;
+          _this8.selectList.filter(function (r) {
             obj.children.find(function (i) {
               if (i[_this.valueKey] === r[_this.valueKey]) {
                 _this.$set(i, 'checked', true);
@@ -3487,14 +3590,13 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
             });
           });
         }
-        _this7.$toast.clear();
+        _this8.$toast.clear();
       });
     },
     getChiled: function getChiled(res, isStart, key) {
-      var _this8 = this;
+      var _this9 = this;
 
       var _that = this;
-      console.log(key, 'key');
       var data = _that.$listeners[key](res.obj, !!res.obj.children);
       if (!isStart) {
         if (res.obj.open) {
@@ -3532,9 +3634,9 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
                   _that.$set(i, 'checked', false);
                 });
               }
-              _this8.$toast.clear();
+              _this9.$toast.clear();
             }).catch(function (err) {
-              _this8.$toast('数据返回错误');
+              _this9.$toast('数据返回错误');
             });
           } else {
             data.map(function (x) {
@@ -3633,8 +3735,8 @@ var _extends = Object.assign || function (target) { for (var i = 1; i < argument
 
 var selector_tree_component = Object(componentNormalizer["a" /* default */])(
   src_selector_treevue_type_script_lang_js_,
-  selector_treevue_type_template_id_342bbb9c_render,
-  selector_treevue_type_template_id_342bbb9c_staticRenderFns,
+  selector_treevue_type_template_id_50a2b4fd_render,
+  selector_treevue_type_template_id_50a2b4fd_staticRenderFns,
   false,
   null,
   null,
@@ -3643,8 +3745,8 @@ var selector_tree_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var selector_tree = (selector_tree_component.exports);
-// 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-field.vue?vue&type=template&id=45799811&
-var selector_fieldvue_type_template_id_45799811_render = function () {
+// 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-field.vue?vue&type=template&id=ef77a3f6&
+var selector_fieldvue_type_template_id_ef77a3f6_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -3803,11 +3905,11 @@ var selector_fieldvue_type_template_id_45799811_render = function () {
     1
   )
 }
-var selector_fieldvue_type_template_id_45799811_staticRenderFns = []
-selector_fieldvue_type_template_id_45799811_render._withStripped = true
+var selector_fieldvue_type_template_id_ef77a3f6_staticRenderFns = []
+selector_fieldvue_type_template_id_ef77a3f6_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/selector/src/selector-field.vue?vue&type=template&id=45799811&
+// CONCATENATED MODULE: ./packages/selector/src/selector-field.vue?vue&type=template&id=ef77a3f6&
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/selector/src/selector-field.vue?vue&type=script&lang=js&
 //
@@ -3903,7 +4005,7 @@ selector_fieldvue_type_template_id_45799811_render._withStripped = true
       default: false
     },
     data: {
-      type: Array,
+      type: [Array, String],
       default: function _default() {
         return [];
       }
@@ -3943,6 +4045,7 @@ selector_fieldvue_type_template_id_45799811_render._withStripped = true
     },
     data: {
       handler: function handler(val) {
+        if (typeof val == 'string') return;
         this.getDefault();
       },
 
@@ -4059,8 +4162,8 @@ selector_fieldvue_type_template_id_45799811_render._withStripped = true
 
 var selector_field_component = Object(componentNormalizer["a" /* default */])(
   src_selector_fieldvue_type_script_lang_js_,
-  selector_fieldvue_type_template_id_45799811_render,
-  selector_fieldvue_type_template_id_45799811_staticRenderFns,
+  selector_fieldvue_type_template_id_ef77a3f6_render,
+  selector_fieldvue_type_template_id_ef77a3f6_staticRenderFns,
   false,
   null,
   null,
@@ -4097,6 +4200,22 @@ var selector_field_component = Object(componentNormalizer["a" /* default */])(
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
 
 
 
@@ -4105,7 +4224,7 @@ var selector_field_component = Object(componentNormalizer["a" /* default */])(
   name: 'EmSelector',
   inheritAttrs: false,
   props: {
-    value: { type: Array, default: function _default() {
+    value: { type: [Array, String], default: function _default() {
         return [];
       } },
     showTree: {
@@ -4116,9 +4235,20 @@ var selector_field_component = Object(componentNormalizer["a" /* default */])(
   data: function data() {
     return {
       showSelectorTree: false
+      // newSelectList:[]
     };
   },
 
+  watch: {
+    value: {
+      handler: function handler(val) {
+        this.selectList = val;
+      },
+
+      deep: true,
+      immediate: true
+    }
+  },
   computed: {
     selectList: {
       get: function get() {
@@ -4129,7 +4259,9 @@ var selector_field_component = Object(componentNormalizer["a" /* default */])(
       }
     }
   },
-  mounted: function mounted() {},
+  mounted: function mounted() {
+    // this.selectList = this.value
+  },
 
   methods: {
     handleSelector: function handleSelector() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-mobiles",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "eoss内部移动端业务组件",
   "main": "lib/eoss-mobile.common.js",
   "files": [

package/packages/selector/src/main.vue

@@ -9,7 +9,7 @@
     />
     <slot v-else name="input" :click="handleSelector" />
     <em-selector-tree
-      v-if="showSelectorTree || showTree"
+      v-if="(showSelectorTree || showTree) && (typeof value !== 'string')"
       v-bind="$attrs"
       v-on="$listeners"
       :showTree="showTree"
@@ -22,6 +22,22 @@
       <slot  v-if="$scopedSlots['tree-icon']" name="tree-icon" :value="value"></slot>
     </template>
     </em-selector-tree>
+    <div v-if="typeof value === 'string'">
+      <em-selector-tree
+      v-show="showSelectorTree || showTree"
+      v-bind="$attrs"
+      v-on="$listeners"
+      :showTree="showTree"
+      :isTreeIcon="$scopedSlots['tree-icon'] != undefined"
+      :selectList.sync="selectList"
+      @dispose="handleDispose"
+      @close="handleDispose()"
+    >
+    <template v-if="$scopedSlots['tree-icon']" slot="tree-icon" slot-scope="{value}">
+      <slot  v-if="$scopedSlots['tree-icon']" name="tree-icon" :value="value"></slot>
+    </template>
+    </em-selector-tree>
+    </div>
   </div>
 </template>
 
@@ -33,17 +49,27 @@ export default {
   name: 'EmSelector',
   inheritAttrs: false,
   props: {
-    value: { type: Array, default: () => [] },
+    value: { type: [Array,String], default: () => [] },
     showTree: {
       type: Boolean,
       default: false
-    }
+    },
   },
   data() {
     return {
-      showSelectorTree: false
+      showSelectorTree: false,
+      // newSelectList:[]
     };
   },
+  watch:{
+    value:{
+      handler(val){
+        this.selectList = val;
+      },
+      deep:true,
+      immediate:true
+    }
+  },
   computed: {
     selectList: {
       get() {
@@ -55,6 +81,7 @@ export default {
     }
   },
   mounted() {
+    // this.selectList = this.value
   },
   methods: {
     handleSelector() {

package/packages/selector/src/selector-field.vue

@@ -90,7 +90,7 @@ export default {
       default: false
     },
     data: {
-      type: Array,
+      type: [Array,String],
       default: () => []
     },
     nextUserList: {
@@ -125,6 +125,7 @@ export default {
     },
     data: {
       handler(val) {
+         if(typeof val == 'string') return
         this.getDefault();
       },
       deep: true,

package/packages/selector/src/selector-tree.vue

@@ -105,7 +105,7 @@ export default {
       default: true
     },
     selectList: {
-      type: Array, //传入选中数组
+      type: [Array, String], //传入选中数组
       default: () => []
     },
     // pid: {
@@ -217,6 +217,7 @@ export default {
       label: '',
       namelike: undefined, //搜索关键字
       list: [], //选中数组
+      selectData: [],
       timer: null,
       isSearch: false,
       newParam: {},
@@ -239,6 +240,26 @@ export default {
       },
       deep: true,
       immediate: true
+    },
+    selectList: {
+      handler(val) {
+        typeof this.selectList != 'string' && (this.list = $.deepClone(val));
+        if (this.personnel.length == 0) {
+          if (this.nodeList) {
+            this.getNodeList();
+          } else {
+            this.getContent();
+          }
+        } else {
+          if (typeof this.selectList == 'string') {
+            this.selectData = [];
+            this.list = this.getSelectData(this.personnel);
+            this.$emit('update:selectList', this.list);
+          }
+        }
+      },
+      deep: true,
+      immediate: true
     }
   },
   computed: {
@@ -503,7 +524,8 @@ export default {
     }
   },
   mounted() {
-    this.list = $.deepClone(this.selectList);
+    typeof this.selectList != 'string' &&
+      (this.list = $.deepClone(this.selectList));
     this.newParam = this.param;
     this.$nextTick(() => {
       if (this.nodeList) {
@@ -650,6 +672,11 @@ export default {
         this.$toast.clear();
         const { rCode, msg } = res;
         if (rCode == 0) {
+          if (typeof this.selectList == 'string') {
+            this.selectData = [];
+            this.list = this.getSelectData(res.results);
+            this.$emit('update:selectList', this.list);
+          }
           this.personnel = res.results;
           let _this = this;
           this.list.filter(r => {
@@ -665,6 +692,20 @@ export default {
         }
       });
     },
+    getSelectData(data) {
+      const _this = this;
+      let user = this.selectList.split(',');
+      user.map(x => {
+        data.map(i => {
+          if (i[_this.valueKey] == x) {
+            this.selectData.push(i);
+          } else if (i.children) {
+            _this.getSelectData(i.children);
+          }
+        });
+      });
+      return this.selectData;
+    },
     getData(obj) {
       let params = {
         ...this.newParam,
@@ -699,8 +740,7 @@ export default {
     },
     getChiled(res, isStart, key) {
       const _that = this;
-      console.log(key,'key')
-      let data = (_that.$listeners[key])(res.obj, !!res.obj.children);
+      let data = _that.$listeners[key](res.obj, !!res.obj.children);
       if (!isStart) {
         if (res.obj.open) {
           this.$set(res.obj, 'open', false);
@@ -783,8 +823,11 @@ export default {
         this.$listeners['node-click'] ||
         this.$listeners['left-icon']
       ) {
-        isNode &&this.$listeners['node-click'] && this.getChiled(res, isStart, 'node-click');
-        this.$listeners['left-icon']&& !isNode &&
+        isNode &&
+          this.$listeners['node-click'] &&
+          this.getChiled(res, isStart, 'node-click');
+        this.$listeners['left-icon'] &&
+          !isNode &&
           this.getChiled(res, isStart, 'left-icon');
       } else {
         if (!isStart) {

package/src/index.js

@@ -93,7 +93,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.2.3',
+  version: '0.2.5',
   install,
   Button,
   ButtonGroup,