n20-common-lib 2.5.0 → 2.5.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n20-common-lib",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "private": false,
   "main": "src/index.js",
   "scripts": {
@@ -116,4 +116,4 @@
     "last 2 versions",
     "not dead"
   ]
-}
+}

package/src/components/AdvancedFilter/form-item-input.vue

@@ -50,8 +50,11 @@
       width:
         form[item.value] && form[item.value].length > 0
           ? context.measureText(
-              item.options.find((r) => r.value === form[item.value] || r[item.props?.valueKey] === form[item.value])
-                .label
+              item.options.find(
+                (r) =>
+                  r.value === form[item.value] ||
+                  (item.props && item.props.valueKey && r[item.props.valueKey] === form[item.value])
+              ).label
             ).width *
               1.4 +
             48 +

package/src/components/AdvancedFilter/index.vue

@@ -25,7 +25,7 @@
       >
         <slot name="prefix"></slot>
       </div>
-      <template v-for="(item, i) in GroupData">
+      <template v-for="item in GroupData">
         <template v-if="item && item.slotName" :slot="item.slotName">
           <slot :name="item.slotName"></slot>
         </template>

package/src/directives/VDrag/index.js

@@ -1,72 +1,72 @@
-/**
- * author: zhengwei
- * tiem: 2021-8-31
- * amend: 只注册到bind上,有问题;onXX会导致事件覆盖
- */
-// 封装全局弹窗拖拽指令 v-drag
-function dialogMoveFn(_this) {
-  var dialogDom = _this.parentNode
-  dialogDom.style.top = parseFloat(dialogDom.style.top || '0') + _this.pageYc + 'px'
-  dialogDom.style.left = parseFloat(dialogDom.style.left || '0') + _this.pageXc + 'px'
-}
-
-const dialogMove = {
-  install: function (Vue) {
-    Vue.directive('drag', {
-      update(el, binding) {
-        if (el.style.display === 'none') {
-          var dialogDom = el.querySelector('.el-dialog')
-          if (dialogDom) {
-            dialogDom.style.left = ''
-            dialogDom.style.top = ''
-          }
-        }
-        Vue.nextTick(function () {
-          var dialogHeader = el.querySelector('.el-dialog__header')
-          if (dialogHeader && !dialogHeader._hasMoveDir) {
-            var _this, pvrPageX, pvrPageY
-            dialogHeader._hasMoveDir = true
-            dialogHeader.style.cursor = 'move'
-
-            dialogHeader.addEventListener('mousedown', function (evt) {
-              var ev = evt || event
-              this.pageXc = this.pageYc = 0
-              _this = this
-              pvrPageX = ev.pageX
-              pvrPageY = ev.pageY
-              document.addEventListener('mousemove', mousemoveThisMove)
-              document.addEventListener('mouseup', mouseupThisMove)
-            })
-
-            var mousemoveThisMove = function (evt) {
-              var ev = evt || event
-              ev.stopPropagation()
-              ev.preventDefault()
-              if (
-                ev.clientX >= 0 &&
-                ev.clientY >= 0 &&
-                ev.clientX <= document.documentElement.clientWidth &&
-                ev.clientY <= document.documentElement.clientHeight
-              ) {
-                _this.pageXc = ev.pageX - pvrPageX
-                _this.pageYc = ev.pageY - pvrPageY
-                if (_this.pageXc !== 0 || _this.pageYc !== 0) {
-                  binding.value ? binding.value(_this, binding.arg) : dialogMoveFn(_this)
-                }
-                pvrPageX = ev.pageX
-                pvrPageY = ev.pageY
-              }
-            }
-
-            var mouseupThisMove = function () {
-              document.removeEventListener('mousemove', mousemoveThisMove)
-              document.removeEventListener('mouseup', mouseupThisMove)
-            }
-          }
-        })
-      }
-    })
-  }
-}
-
-export default dialogMove
+/**
+ * author: zhengwei
+ * tiem: 2021-8-31
+ * amend: 只注册到bind上,有问题;onXX会导致事件覆盖
+ */
+// 封装全局弹窗拖拽指令 v-drag
+function dialogMoveFn(_this) {
+  var dialogDom = _this.parentNode
+  dialogDom.style.top = parseFloat(dialogDom.style.top || '0') + _this.pageYc + 'px'
+  dialogDom.style.left = parseFloat(dialogDom.style.left || '0') + _this.pageXc + 'px'
+}
+
+const dialogMove = {
+  install: function (Vue) {
+    Vue.directive('drag', {
+      update(el, binding) {
+        if (el.style.display === 'none') {
+          var dialogDom = el.querySelector('.el-dialog')
+          if (dialogDom) {
+            dialogDom.style.left = ''
+            dialogDom.style.top = ''
+          }
+        }
+        Vue.nextTick(function () {
+          var dialogHeader = el.querySelector('.el-dialog__header')
+          if (dialogHeader && !dialogHeader._hasMoveDir) {
+            var _this, pvrPageX, pvrPageY
+            dialogHeader._hasMoveDir = true
+            dialogHeader.style.cursor = 'move'
+
+            dialogHeader.addEventListener('mousedown', function (evt) {
+              var ev = evt || event
+              this.pageXc = this.pageYc = 0
+              _this = this
+              pvrPageX = ev.pageX
+              pvrPageY = ev.pageY
+              document.addEventListener('mousemove', mousemoveThisMove)
+              document.addEventListener('mouseup', mouseupThisMove)
+            })
+
+            var mousemoveThisMove = function (evt) {
+              var ev = evt || event
+              ev.stopPropagation()
+              ev.preventDefault()
+              if (
+                ev.clientX >= 0 &&
+                ev.clientY >= 0 &&
+                ev.clientX <= document.documentElement.clientWidth &&
+                ev.clientY <= document.documentElement.clientHeight
+              ) {
+                _this.pageXc = ev.pageX - pvrPageX
+                _this.pageYc = ev.pageY - pvrPageY
+                if (_this.pageXc !== 0 || _this.pageYc !== 0) {
+                  binding.value ? binding.value(_this, binding.arg) : dialogMoveFn(_this)
+                }
+                pvrPageX = ev.pageX
+                pvrPageY = ev.pageY
+              }
+            }
+
+            var mouseupThisMove = function () {
+              document.removeEventListener('mousemove', mousemoveThisMove)
+              document.removeEventListener('mouseup', mouseupThisMove)
+            }
+          }
+        })
+      }
+    })
+  }
+}
+
+export default dialogMove