eoss-mobiles 0.2.44 → 0.2.46

package/lib/grid.js

@@ -82,7 +82,7 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 25);
+/******/ 	return __webpack_require__(__webpack_require__.s = 26);
 /******/ })
 /************************************************************************/
 /******/ ({
@@ -192,14 +192,21 @@ function normalizeComponent(
 
 /***/ }),
 
-/***/ 25:
+/***/ 10:
+/***/ (function(module, exports) {
+
+module.exports = require("vuedraggable");
+
+/***/ }),
+
+/***/ 26:
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 // 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/grid/src/main.vue?vue&type=template&id=b1bd9a9e&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/grid/src/main.vue?vue&type=template&id=1f9590ec&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -227,142 +234,366 @@ var render = function () {
           _vm.$listeners
         ),
         [
-          _vm._l(_vm.newData, function (item, index) {
-            return _c(
-              "van-grid-item",
-              _vm._b(
+          _vm.draggable
+            ? _c(
+                "draggable",
                 {
-                  directives: [
-                    {
-                      name: "show",
-                      rawName: "v-show",
-                      value: _vm.newData && _vm.newData.length > 0,
-                      expression: "newData && newData.length > 0",
+                  staticClass: "menu-list-draggable",
+                  staticStyle: { width: "100%" },
+                  model: {
+                    value: _vm.newData,
+                    callback: function ($$v) {
+                      _vm.newData = $$v
                     },
-                  ],
-                  key: index,
-                  class: { "em-grid-ellipsis": _vm.textEllipsis },
-                  style: "width:" + 100 / _vm.columnNum + "%;",
-                  on: {
-                    click: function ($event) {
-                      $event.stopPropagation()
-                      _vm.goView($event, item)
+                    expression: "newData",
+                  },
+                },
+                [
+                  _c(
+                    "transition-group",
+                    {
+                      staticClass: "menu-list-draggable-item",
+                      staticStyle: { width: "100%" },
                     },
+                    _vm._l(_vm.newData, function (item) {
+                      return _c(
+                        "div",
+                        {
+                          key: item.id,
+                          staticClass: "van-grid-item",
+                          style:
+                            "display: inline-block;width:" +
+                            100 / _vm.columnNum +
+                            "%",
+                          on: {
+                            mousedown: function ($event) {
+                              $event.stopPropagation()
+                              _vm.onMouseDown(item)
+                            },
+                            mouseup: function ($event) {
+                              $event.stopPropagation()
+                              _vm.onMouseUp($event, item)
+                            },
+                          },
+                        },
+                        [
+                          _c(
+                            "div",
+                            {
+                              staticClass:
+                                "van-grid-item__content van-grid-item__content--center van-hairline",
+                            },
+                            [
+                              _c(
+                                "i",
+                                {
+                                  staticClass: "van-icon  van-grid-item__icon",
+                                  class:
+                                    item.icon.startsWith("http") &&
+                                    item.icon.indexOf("/") != -1
+                                      ? ""
+                                      : "van-icon-" + item.icon,
+                                  style: {
+                                    fontSize:
+                                      item.iconSize || _vm.$attrs["icon-size"]
+                                        ? item.iconSize ||
+                                          _vm.$attrs["icon-size"]
+                                        : "",
+                                  },
+                                },
+                                [
+                                  item.icon.startsWith("http") ||
+                                  item.icon.indexOf("/") != -1
+                                    ? _c("img", {
+                                        staticClass: "van-icon__image",
+                                        style: {
+                                          width:
+                                            item.iconSize ||
+                                            _vm.$attrs["icon-size"]
+                                              ? item.iconSize ||
+                                                _vm.$attrs["icon-size"]
+                                              : "",
+                                          height:
+                                            item.iconSize ||
+                                            _vm.$attrs["icon-size"]
+                                              ? item.iconSize ||
+                                                _vm.$attrs["icon-size"]
+                                              : "",
+                                        },
+                                        attrs: { src: item.icon },
+                                      })
+                                    : _vm._e(),
+                                  _c("div", {
+                                    directives: [
+                                      {
+                                        name: "show",
+                                        rawName: "v-show",
+                                        value: item.dot,
+                                        expression: "item.dot",
+                                      },
+                                    ],
+                                    staticClass: "van-info van-info--dot",
+                                    style: { background: item.dotColor || "" },
+                                  }),
+                                  _c(
+                                    "div",
+                                    {
+                                      directives: [
+                                        {
+                                          name: "show",
+                                          rawName: "v-show",
+                                          value: item.badge,
+                                          expression: "item.badge",
+                                        },
+                                      ],
+                                      staticClass: "van-info",
+                                      style: {
+                                        background: _vm.badgeColor || "",
+                                      },
+                                    },
+                                    [
+                                      _vm._v(
+                                        "\n                " +
+                                          _vm._s(
+                                            _vm.maxBadge &&
+                                              !isNaN(item.badge) &&
+                                              Number(_vm.maxBadge) <
+                                                Number(item.badge)
+                                              ? _vm.maxBadge + "+"
+                                              : item.badge
+                                          ) +
+                                          "\n              "
+                                      ),
+                                    ]
+                                  ),
+                                ]
+                              ),
+                              _c("em-popover", {
+                                attrs: {
+                                  placement: _vm.placement,
+                                  theme: _vm.popoverTheme,
+                                  actions: _vm.popoverActions,
+                                },
+                                on: { select: _vm.popoverSelect },
+                                model: {
+                                  value: item.showPopover,
+                                  callback: function ($$v) {
+                                    _vm.$set(item, "showPopover", $$v)
+                                  },
+                                  expression: "item.showPopover",
+                                },
+                              }),
+                              _c(
+                                "span",
+                                { staticClass: "van-grid-item__text" },
+                                [_vm._v(_vm._s(item.text))]
+                              ),
+                              _vm.showHide && item.menuType != "add"
+                                ? _c("van-icon", {
+                                    staticClass: "em-grid-del",
+                                    attrs: { name: "clear", size: "20px" },
+                                    on: {
+                                      click: function ($event) {
+                                        $event.stopPropagation()
+                                        _vm.handleHide(item)
+                                      },
+                                    },
+                                  })
+                                : _vm._e(),
+                              item.showMenu
+                                ? _c(
+                                    "div",
+                                    { staticClass: "em-grid-select-box" },
+                                    [
+                                      _c("van-icon", {
+                                        attrs: {
+                                          size: "30px",
+                                          color: "#fff",
+                                          name: "success",
+                                        },
+                                      }),
+                                    ],
+                                    1
+                                  )
+                                : _vm._e(),
+                            ],
+                            1
+                          ),
+                        ]
+                      )
+                    }),
+                    0
+                  ),
+                ],
+                1
+              )
+            : _vm._e(),
+          _vm._l(_vm.newData, function (item) {
+            return _c(
+              "div",
+              {
+                directives: [
+                  {
+                    name: "show",
+                    rawName: "v-show",
+                    value:
+                      _vm.newData && _vm.newData.length > 0 && !_vm.draggable,
+                    expression: "newData && newData.length > 0 && !draggable",
+                  },
+                ],
+                key: item.id,
+                staticClass: "van-grid-item",
+                style:
+                  "display: inline-block;width:" + 100 / _vm.columnNum + "%",
+                on: {
+                  mousedown: function ($event) {
+                    $event.stopPropagation()
+                    _vm.onMouseDown(item)
+                  },
+                  mouseup: function ($event) {
+                    $event.stopPropagation()
+                    _vm.onMouseUp($event, item)
                   },
                 },
-                "van-grid-item",
-                item,
-                false
-              ),
+              },
               [
                 _c(
-                  "i",
+                  "div",
                   {
-                    staticClass: "van-icon  van-grid-item__icon",
-                    class:
-                      item.icon.startsWith("http") &&
-                      item.icon.indexOf("/") != -1
-                        ? ""
-                        : "van-icon-" + item.icon,
-                    style: {
-                      fontSize:
-                        item.iconSize || _vm.$attrs["icon-size"]
-                          ? item.iconSize || _vm.$attrs["icon-size"]
-                          : "",
-                    },
+                    staticClass:
+                      "van-grid-item__content van-grid-item__content--center van-hairline",
                   },
                   [
-                    item.icon.startsWith("http") || item.icon.indexOf("/") != -1
-                      ? _c("img", {
-                          staticClass: "van-icon__image",
-                          style: {
-                            width:
-                              item.iconSize || _vm.$attrs["icon-size"]
-                                ? item.iconSize || _vm.$attrs["icon-size"]
-                                : "",
-                            height:
-                              item.iconSize || _vm.$attrs["icon-size"]
-                                ? item.iconSize || _vm.$attrs["icon-size"]
-                                : "",
-                          },
-                          attrs: { src: item.icon },
-                        })
-                      : _vm._e(),
-                    _c("div", {
-                      directives: [
-                        {
-                          name: "show",
-                          rawName: "v-show",
-                          value: item.dot,
-                          expression: "item.dot",
-                        },
-                      ],
-                      staticClass: "van-info van-info--dot",
-                      style: { background: item.dotColor || "" },
-                    }),
                     _c(
-                      "div",
+                      "i",
                       {
-                        directives: [
-                          {
-                            name: "show",
-                            rawName: "v-show",
-                            value: item.badge,
-                            expression: "item.badge",
-                          },
-                        ],
-                        staticClass: "van-info",
-                        style: { background: _vm.badgeColor || "" },
+                        staticClass: "van-icon  van-grid-item__icon",
+                        class:
+                          item.icon.startsWith("http") &&
+                          item.icon.indexOf("/") != -1
+                            ? ""
+                            : "van-icon-" + item.icon,
+                        style: {
+                          fontSize:
+                            item.iconSize || _vm.$attrs["icon-size"]
+                              ? item.iconSize || _vm.$attrs["icon-size"]
+                              : "",
+                        },
                       },
                       [
-                        _vm._v(
-                          "\n          " +
-                            _vm._s(
-                              _vm.maxBadge &&
-                                !isNaN(item.badge) &&
-                                Number(_vm.maxBadge) < Number(item.badge)
-                                ? _vm.maxBadge + "+"
-                                : item.badge
-                            ) +
-                            "\n        "
+                        item.icon.startsWith("http") ||
+                        item.icon.indexOf("/") != -1
+                          ? _c("img", {
+                              staticClass: "van-icon__image",
+                              style: {
+                                width:
+                                  item.iconSize || _vm.$attrs["icon-size"]
+                                    ? item.iconSize || _vm.$attrs["icon-size"]
+                                    : "",
+                                height:
+                                  item.iconSize || _vm.$attrs["icon-size"]
+                                    ? item.iconSize || _vm.$attrs["icon-size"]
+                                    : "",
+                              },
+                              attrs: { src: item.icon },
+                            })
+                          : _vm._e(),
+                        _c("div", {
+                          directives: [
+                            {
+                              name: "show",
+                              rawName: "v-show",
+                              value: item.dot,
+                              expression: "item.dot",
+                            },
+                          ],
+                          staticClass: "van-info van-info--dot",
+                          style: { background: item.dotColor || "" },
+                        }),
+                        _c(
+                          "div",
+                          {
+                            directives: [
+                              {
+                                name: "show",
+                                rawName: "v-show",
+                                value: item.badge,
+                                expression: "item.badge",
+                              },
+                            ],
+                            staticClass: "van-info",
+                            style: { background: _vm.badgeColor || "" },
+                          },
+                          [
+                            _vm._v(
+                              "\n            " +
+                                _vm._s(
+                                  _vm.maxBadge &&
+                                    !isNaN(item.badge) &&
+                                    Number(_vm.maxBadge) < Number(item.badge)
+                                    ? _vm.maxBadge + "+"
+                                    : item.badge
+                                ) +
+                                "\n          "
+                            ),
+                          ]
                         ),
                       ]
                     ),
-                  ]
-                ),
-                _c("span", { staticClass: "van-grid-item__text" }, [
-                  _vm._v(_vm._s(item.text)),
-                ]),
-                _vm.showHide && item.menuType != "add"
-                  ? _c("van-icon", {
-                      staticClass: "em-grid-del",
-                      attrs: { name: "clear", size: "20px" },
+                    _c("em-popover", {
+                      attrs: {
+                        placement: _vm.placement,
+                        theme: _vm.popoverTheme,
+                        actions: _vm.popoverActions,
+                      },
                       on: {
-                        click: function ($event) {
-                          $event.stopPropagation()
-                          _vm.handleHide(item)
+                        select: function ($event) {
+                          _vm.popoverSelect($event, item)
                         },
                       },
-                    })
-                  : _vm._e(),
-                item.showMenu
-                  ? _c(
-                      "div",
-                      { staticClass: "em-grid-select-box" },
-                      [
-                        _c("van-icon", {
-                          attrs: {
-                            size: "30px",
-                            color: "#fff",
-                            name: "success",
+                      model: {
+                        value: item.showPopover,
+                        callback: function ($$v) {
+                          _vm.$set(item, "showPopover", $$v)
+                        },
+                        expression: "item.showPopover",
+                      },
+                    }),
+                    _c("span", { staticClass: "van-grid-item__text" }, [
+                      _vm._v(_vm._s(item.text)),
+                    ]),
+                    _vm.showHide && item.menuType != "add"
+                      ? _c("van-icon", {
+                          staticClass: "em-grid-del",
+                          attrs: { name: "clear", size: "20px" },
+                          on: {
+                            click: function ($event) {
+                              $event.stopPropagation()
+                              _vm.handleHide(item)
+                            },
                           },
-                        }),
-                      ],
-                      1
-                    )
-                  : _vm._e(),
-              ],
-              1
+                        })
+                      : _vm._e(),
+                    item.showMenu
+                      ? _c(
+                          "div",
+                          { staticClass: "em-grid-select-box" },
+                          [
+                            _c("van-icon", {
+                              attrs: {
+                                size: "30px",
+                                color: "#fff",
+                                name: "success",
+                              },
+                            }),
+                          ],
+                          1
+                        )
+                      : _vm._e(),
+                  ],
+                  1
+                ),
+              ]
             )
           }),
           _vm._t("default"),
@@ -450,7 +681,11 @@ var staticRenderFns = []
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/grid/src/main.vue?vue&type=template&id=b1bd9a9e&
+// CONCATENATED MODULE: ./packages/grid/src/main.vue?vue&type=template&id=1f9590ec&
+
+// EXTERNAL MODULE: external "vuedraggable"
+var external_vuedraggable_ = __webpack_require__(10);
+var external_vuedraggable_default = /*#__PURE__*/__webpack_require__.n(external_vuedraggable_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/grid/src/main.vue?vue&type=script&lang=js&
 //
@@ -544,10 +779,137 @@ render._withStripped = true
 //
 //
 //
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+//
+
 
 /* harmony default export */ var mainvue_type_script_lang_js_ = ({
   name: 'EmGrid',
   inheritAttrs: false,
+  components: { draggable: external_vuedraggable_default.a },
   props: {
     data: {
       type: Array,
@@ -596,15 +958,38 @@ render._withStripped = true
     addMenuIconSize: {
       type: String,
       default: '40px'
+    },
+    draggable: {
+      type: Boolean,
+      default: false
+    },
+    popoverActions: {
+      type: Array,
+      default: function _default() {
+        return [{ text: '隐藏菜单', type: 'hideMenu' }];
+      }
+    },
+    isTouch: {
+      type: Boolean,
+      default: false
+    },
+    placement: {
+      type: String,
+      default: 'top'
+    },
+    popoverTheme: {
+      type: String,
+      default: 'dark'
     }
   },
   data: function data() {
     return {
-      lastTapTime: 0,
       timer: null,
       showHide: false,
+      isLongPress: false,
       newData: [],
       show: false,
+      showPopover: false,
       selectMenuArr: [],
       hideMenuList: []
     };
@@ -630,24 +1015,56 @@ render._withStripped = true
     }
   },
   methods: {
+    popoverSelect: function popoverSelect(val, item) {
+      if (val.type == 'hideMenu') {
+        this.handleHide(item);
+      } else {
+        this.$emit('touchSelect', { action: val, data: item });
+      }
+    },
+    onMouseDown: function onMouseDown(item) {
+      var _this = this;
+
+      // this.showPopover = true
+      if (this.draggable || !this.isTouch) return;
+      this.isLongPress = false;
+      this.timer = setTimeout(function () {
+        if (_this.isLongPress === false) {
+          _this.isLongPress = true;
+          _this.lastTapTime = new Date().getTime();
+          _this.$set(item, 'showPopover', true);
+        }
+      }, 500);
+    },
+    onMouseUp: function onMouseUp($event, item) {
+      if (this.isLongPress === false) {
+        this.lastTapTime = new Date().getTime();
+        this.$set(item, 'showPopover', false);
+        this.goView($event, item);
+        // 执行相应的操作
+      }
+      this.isLongPress = false;
+      clearTimeout(this.timer);
+    },
     hideDelIcon: function hideDelIcon() {
       this.showHide = false;
     },
     handleShowMenu: function handleShowMenu() {
-      var _this = this;
+      var _this2 = this;
 
-      var str = this.selectMenuArr.join(',');
+      var str = this.selectMenuArr;
+      // let str = this.selectMenuArr.join(',');
       if (Array.isArray(this.hideMenu)) {
         var hideArr = this.hideMenuList.filter(function (x) {
-          return str.indexOf(x[_this.hideMenuKey]) == -1;
+          return str.indexOf(x[_this2.hideMenuKey]) == -1;
         });
         this.$emit('hide', hideArr);
       } else {
         var hide = this.hideMenuList.filter(function (x) {
-          return str.indexOf(x[_this.hideMenuKey]) == -1;
+          return str.indexOf(x[_this2.hideMenuKey]) == -1;
         });
         hide = hide.map(function (x) {
-          return x[_this.hideMenuKey];
+          return x[_this2.hideMenuKey];
         });
         this.$emit('hide', hide.join(','));
       }
@@ -655,11 +1072,11 @@ render._withStripped = true
       this.show = false;
     },
     selectMenu: function selectMenu(val) {
-      var _this2 = this;
+      var _this3 = this;
 
       if (val.showMenu) {
         this.selectMenuArr = this.selectMenuArr.filter(function (x) {
-          return x != val[_this2.hideMenuKey];
+          return x != val[_this3.hideMenuKey];
         });
       } else {
         this.selectMenuArr.push(val[this.hideMenuKey]);
@@ -667,26 +1084,27 @@ render._withStripped = true
       this.$set(val, 'showMenu', !val.showMenu);
     },
     defaultHide: function defaultHide(val) {
-      var _this3 = this;
+      var _this4 = this;
 
       if (this.isHideMenu && val != undefined) {
         if (Array.isArray(val)) {
           var menuKey = val.map(function (x) {
             return x.id;
-          }).join(',');
+          });
+          // let menuKey = val.map(x => x.id).join(',');
           this.newData = this.data.filter(function (x) {
-            return menuKey.indexOf(x[_this3.hideMenuKey]) == -1;
+            return menuKey.indexOf(x[_this4.hideMenuKey]) == -1;
           });
           this.hideMenuList = this.data.filter(function (x) {
-            return menuKey.indexOf(x[_this3.hideMenuKey]) != -1;
+            return menuKey.indexOf(x[_this4.hideMenuKey]) != -1;
           });
         } else {
           val = val + '';
           this.newData = this.data.filter(function (x) {
-            return val.indexOf(x[_this3.hideMenuKey]) == -1;
+            return val.indexOf(x[_this4.hideMenuKey]) == -1;
           });
           this.hideMenuList = this.data.filter(function (x) {
-            return val.indexOf(x[_this3.hideMenuKey]) != -1;
+            return val.indexOf(x[_this4.hideMenuKey]) != -1;
           });
         }
       }
@@ -699,44 +1117,45 @@ render._withStripped = true
       }
     },
     handleHide: function handleHide(item) {
-      var _this4 = this;
+      var _this5 = this;
 
       this.$dialog.confirm({
         message: '\u786E\u5B9A\u8981\u9690\u85CF<span style="color:red;font-weight:bold;margin:0px 5px">' + item.text + '</span>\u83DC\u5355\u5417\uFF1F'
       }).then(function () {
-        if (Array.isArray(_this4.hideMenu)) {
-          var hideArr = [].concat(_this4.hideMenu, [item]);
-          _this4.$emit('hide', hideArr);
+        if (Array.isArray(_this5.hideMenu)) {
+          var hideArr = [].concat(_this5.hideMenu, [item]);
+          _this5.$emit('hide', hideArr);
         } else {
-          var hideStr = _this4.hideMenu ? _this4.hideMenu + ',' + item[_this4.hideMenuKey] : item[_this4.hideMenuKey];
-          _this4.$emit('hide', hideStr);
+          var hideStr = _this5.hideMenu ? _this5.hideMenu + ',' + item[_this5.hideMenuKey] : item[_this5.hideMenuKey];
+          _this5.$emit('hide', hideStr);
         }
       });
     },
     goView: function goView(event, val) {
-      var _this5 = this;
-
       if (val.menuType === 'add') {
         this.show = true;
         return;
       }
-      var currentTime = new Date().getTime();
-      var tapLength = currentTime - this.lastTapTime;
-      this.lastTapTime = currentTime;
+      // const currentTime = new Date().getTime();
+      // const tapLength = currentTime - this.lastTapTime;
+      // this.lastTapTime = currentTime;
+      // if (tapLength > 300) {
+      //   return;
+      // }
       if (this.isHideMenu) {
-        if (tapLength < 300) {
-          this.handleDoubleClick(val);
-          clearTimeout(this.timer);
-          return;
-        }
-        if (this.showHide) {
-          this.showHide = false;
-          return;
-        }
-        this.timer = setTimeout(function () {
-          _this5.$emit('click', val, event);
-          _this5.targetStop && event.stopPropagation();
-        }, 300);
+        // if (tapLength < 300) {
+        //   this.handleDoubleClick(val);
+        //   clearTimeout(this.timer);
+        //   return;
+        // }
+        // if (this.showHide) {
+        //   this.showHide = false;
+        //   return;
+        // }
+        // this.timer = setTimeout(() => {
+        this.$emit('click', val, event);
+        this.targetStop && event.stopPropagation();
+        // }, 300);
       } else {
         this.$emit('click', val, event);
         this.targetStop && event.stopPropagation();