@tongfun/tf-widget 0.1.152 → 0.1.154

package/lib/tf-widget.common.js

@@ -140080,8 +140080,8 @@ var component = (0,componentNormalizer/* default */.Z)(
 /* harmony default export */ var tf_filter = (component.exports);
 // EXTERNAL MODULE: ./src/utils/index.js
 var utils = __webpack_require__(42325);
-// EXTERNAL MODULE: ./src/directives/index.js + 31 modules
-var directives = __webpack_require__(7183);
+// EXTERNAL MODULE: ./src/directives/index.js + 33 modules
+var directives = __webpack_require__(65146);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/tf-table/src/index.vue?vue&type=script&lang=js&
 //
 //
@@ -140831,21 +140831,20 @@ function getVoucherIds(data) {
 
 /***/ }),
 
-/***/ 7183:
+/***/ 65146:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
 
 // EXPORTS
 __webpack_require__.d(__webpack_exports__, {
+  "Lh": function() { return /* reexport */ ElDialogDrag; },
   "Ds": function() { return /* reexport */ debounce; },
   "Cq": function() { return /* reexport */ tableAutoHeight; },
   "AB": function() { return /* reexport */ umyColumnWidth; },
   "b$": function() { return /* reexport */ umyTableSetting; }
 });
 
-// UNUSED EXPORTS: ElDialogDrag
-
 ;// CONCATENATED MODULE: ./src/directives/modules/debounce.js
 const debounce = {
   bind: function (el, {
@@ -141110,6 +141109,18 @@ async function initColumnDrag(el, binding, vNode) {
     el.tfSettingInstance?.forceInit(el.umyTableSetting.tableConfigList);
   };
 }
+;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/js/util.js
+function getFieldIndex(obj) {
+  let fieldIndex,
+      current = obj;
+
+  while (!fieldIndex && current) {
+    fieldIndex = current.fieldIndex;
+    current = obj.children ? obj.children[0] : null;
+  }
+
+  return fieldIndex;
+}
 // EXTERNAL MODULE: external {"commonjs":"vue","commonjs2":"vue","root":"Vue"}
 var external_commonjs_vue_commonjs2_vue_root_Vue_ = __webpack_require__(13797);
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
@@ -141819,6 +141830,7 @@ var tf_setting_component = (0,componentNormalizer/* default */.Z)(
 
 
 
+
 external_commonjs_vue_commonjs2_vue_root_Vue_default().component('DirectiveColumnHeader', column_header);
 /** 初始化表格配置信息 */
 
@@ -142007,11 +142019,12 @@ const reloadColumns = async (el, binding, vNode) => {
   const {
     collectColumn
   } = tableInstance.getTableColumn();
-  collectColumn.sort((a, b) => a.fieldIndex - b.fieldIndex);
+  collectColumn.sort((a, b) => getFieldIndex(a) - getFieldIndex(b));
   tableInstance.reloadColumn(collectColumn);
 };
 ;// CONCATENATED MODULE: ./src/directives/modules/umy-table-setting/js/watch.js
 
+
 /** 表格列宽变化事件 */
 
 function watch_watchTableHeaderNode(el, binding, vNode) {
@@ -142102,19 +142115,6 @@ const addSettingColumn = (el, binding, vNode) => {
   const newColumns = settingColumn ? [...columns, { ...settingColumn,
     ...mixinObj
   }] : [...columns, mixinObj];
-
-  const getFieldIndex = obj => {
-    let fieldIndex,
-        current = obj;
-
-    while (!fieldIndex && current) {
-      fieldIndex = current.fieldIndex;
-      current = obj.children ? obj.children[0] : null;
-    }
-
-    return fieldIndex;
-  };
-
   newColumns.sort((a, b) => getFieldIndex(a) - getFieldIndex(b));
   tableInstance.loadColumn(newColumns);
 };
@@ -142279,14 +142279,55 @@ const tableAutoHeight = {
   }
 
 };
+;// CONCATENATED MODULE: ./src/directives/modules/el-dialog-drag/js/init.js
+/** 弹框初始化 */
+function init(el, binding, vNode) {
+  //初始化弹框属性
+  initAttrs(el, binding, vNode); // 初始化弹框位置
+
+  initPostion(el, binding, vNode);
+}
+/** 初始化弹框属性 */
+
+function initAttrs(el, binding, vNode) {
+  const dialogInstance = vNode.componentInstance; // 禁止用户点击外侧关闭弹框
+  // dialogInstance.closeOnClickModal = false
+}
+/** 第一次打开弹框时初始化弹框位置 */
+
+function initPostion(el, binding, vNode) {
+  let hasInit = false;
+
+  const initFn = el => {
+    const dragDom = el.querySelector('.el-dialog');
+    const offsetLeft = dragDom.offsetLeft;
+    const dargDomWidth = dragDom.clientWidth;
+    const dargDomHeight = dragDom.clientHeight;
+    dragDom.style.width = dargDomWidth + 'px';
+    dragDom.style.height = dargDomHeight + 'px';
+    dragDom.style.marginLeft = offsetLeft + 'px';
+  };
+
+  const vm = vNode.context;
+  const dialogInstance = vNode.componentInstance;
+  vm.$watch(() => {
+    return dialogInstance.visible;
+  }, newVal => {
+    if (!hasInit && newVal) {
+      initFn(el);
+      hasInit = true;
+    }
+  }, {
+    immediate: true
+  });
+}
 ;// CONCATENATED MODULE: ./src/directives/modules/el-dialog-drag/js/drag.js
 /** 弹框支持拖拽 */
-function drag(el, binding, vnode) {
+function drag(el, binding, vNode) {
   const dragDom = el.querySelector('.el-dialog');
   const dialogHeaderEl = el.querySelector('.el-dialog__header');
   dragDom.style.overflow = 'auto';
-  dialogHeaderEl.style.cursor = 'move'; // dragDom.style.cssText += ';top:0px;'
-
+  dialogHeaderEl.style.cursor = 'move';
   /**
    * 获取原有属性
    * IE dom元素.currentStyle
@@ -142310,12 +142351,12 @@ function drag(el, binding, vnode) {
 
     let styL, styT; // 注意在ie中 第一次获取到的值为组件自带50% 移动之后赋值为px
 
-    if (!sty.left.includes('%')) {
-      styL = +sty.left.replace(/\px/g, '');
-      styT = +sty.top.replace(/\px/g, '');
+    if (!sty.marginLeft.includes('%')) {
+      styL = +sty.marginLeft.replace(/\px/g, '');
+      styT = +sty.marginTop.replace(/\px/g, '');
     } else {
-      styL = +document.body.clientWidth * (+sty.left.replace(/\%/g, '') / 100);
-      styT = +document.body.clientHeight * (+sty.top.replace(/\%/g, '') / 100);
+      styL = +document.body.clientWidth * (+sty.marginLeft.replace(/\%/g, '') / 100);
+      styT = +document.body.clientHeight * (+sty.marginTop.replace(/\%/g, '') / 100);
     }
 
     document.onmousemove = function (e) {
@@ -142334,15 +142375,16 @@ function drag(el, binding, vnode) {
       } else if (top > maxDragDomTop) {
         top = maxDragDomTop;
       } // 移动当前元素
-      // dragDom.style.cssText += `;left:${left + styL}px;top:${top + styT}px;`
 
 
-      dragDom.style.top = `${top + styT}px`;
-      dragDom.style.left = `${left + styL}px`;
-      vnode.child.$emit('dragDialog');
+      dragDom.style.marginTop = `${top + styT}px`;
+      dragDom.style.marginLeft = `${left + styL}px`;
+      dragDom.style.userSelect = 'none';
+      vNode.child.$emit('dragDialog');
     };
 
     document.onmouseup = function () {
+      dragDom.style.userSelect = 'auto';
       document.onmousemove = null;
       document.onmouseup = null;
     };
@@ -142352,21 +142394,39 @@ function drag(el, binding, vnode) {
 }
 ;// CONCATENATED MODULE: ./src/directives/modules/el-dialog-drag/js/resize.js
 /** 弹框拖拽改变大小 */
-function resize(el, binding, value) {
+function resize(el, binding, vNode) {
   const minWidth = 400;
-  const minHeight = 400;
+  const minHeight = 250;
   const dragDom = el.querySelector('.el-dialog');
+  const dialogHeaderEl = el.querySelector('.el-dialog__header');
+
+  const setDragDomWidth = (marginLeft, newWidth) => {
+    if (marginLeft > 0 && newWidth > minWidth && marginLeft + newWidth <= document.body.clientWidth) {
+      dragDom.style.marginLeft = marginLeft + 'px';
+      dragDom.style.width = newWidth + 'px';
+    }
+  };
+
+  const setDragDomHeight = newHeight => {
+    if (newHeight + dragDom.offsetTop <= document.body.clientHeight && newHeight >= minHeight) {
+      dragDom.style.height = newHeight + 'px';
+    }
+  };
 
   dragDom.onmousemove = function (e) {
     // 图标变换
-    if (dragDom.offsetLeft + 10 > e.clientX) {
-      dragDom.style.cursor = 'w-resize';
-    } else if (e.clientX > dragDom.offsetLeft + dragDom.clientWidth - 10) {
-      dragDom.style.cursor = 'e-resize';
-    } else if (el.scrollTop + e.clientY > dragDom.offsetTop + dragDom.clientHeight - 10) {
+    const isLeft = dragDom.offsetLeft + 10 > e.clientX;
+    const isRight = e.clientX > dragDom.offsetLeft + dragDom.clientWidth - 10;
+    const isBottom = el.scrollTop + e.clientY > dragDom.offsetTop + dragDom.clientHeight - 10;
+
+    if (isLeft) {
+      dragDom.style.cursor = isBottom ? 'nesw-resize' : 'w-resize';
+    } else if (isRight) {
+      dragDom.style.cursor = isBottom ? 'nwse-resize' : 'e-resize';
+    } else if (isBottom) {
       dragDom.style.cursor = 's-resize';
     } else {
-      dragDom.style.cursor = 'default';
+      dragDom.style.cursor = 'auto';
       dragDom.onmousedown = null;
     } // 改变大小
 
@@ -142374,72 +142434,68 @@ function resize(el, binding, value) {
     dragDom.onmousedown = e => {
       const clientX = e.clientX;
       const clientY = e.clientY;
-      let elW = dragDom.clientWidth;
-      let elH = dragDom.clientHeight;
-      let EloffsetLeft = dragDom.offsetLeft;
-      let EloffsetTop = dragDom.offsetTop;
-      dragDom.style.userSelect = 'none';
-      let ELscrollTop = el.scrollTop; // 判断点击的位置是不是为头部
+      const elW = dragDom.clientWidth;
+      const elH = dragDom.clientHeight;
+      const ELscrollTop = el.scrollTop;
+      const EloffsetTop = dragDom.offsetTop;
+      const EloffsetLeft = dragDom.offsetLeft; // 判断点击的位置是不是为头部
 
-      if (clientX > EloffsetLeft && clientX < EloffsetLeft + elW && clientY > EloffsetTop && clientY < EloffsetTop + 100) {// 如果是头部在此就不做任何动作，以上有绑定dialogHeaderEl.onmousedown = moveDown;
+      if (clientX > EloffsetLeft && clientX < EloffsetLeft + elW && clientY > EloffsetTop && clientY < EloffsetTop + dialogHeaderEl.clientHeight) {// 如果是头部在此就不做任何动作，以上有绑定dialogHeaderEl.onmousedown = moveDown;
       } else {
         document.onmousemove = function (e) {
-          e.preventDefault(); // 移动时禁用默认事件
+          // e.preventDefault()
           // 左侧鼠标拖拽位置
-
           if (clientX > EloffsetLeft && clientX < EloffsetLeft + 10) {
-            // 往左拖拽
+            dragDom.style.userSelect = 'none'; // 往左拖拽
+
             if (clientX > e.clientX) {
-              dragDom.style.width = elW + (clientX - e.clientX) * 2 + 'px';
+              const moveLen = clientX - e.clientX;
+              setDragDomWidth(EloffsetLeft - moveLen, elW + moveLen);
             } // 往右拖拽
 
 
             if (clientX < e.clientX) {
-              if (dragDom.clientWidth < minWidth) {
-                console.log();
-              } else {
-                dragDom.style.width = elW - (e.clientX - clientX) * 2 + 'px';
-              }
+              const moveLen = e.clientX - clientX;
+              setDragDomWidth(EloffsetLeft + moveLen, elW - moveLen);
             }
           } // 右侧鼠标拖拽位置
 
 
           if (clientX > EloffsetLeft + elW - 10 && clientX < EloffsetLeft + elW) {
-            // 往左拖拽
+            dragDom.style.userSelect = 'none'; // 往左拖拽
+
             if (clientX > e.clientX) {
-              if (dragDom.clientWidth < minWidth) {
-                console.log();
-              } else {
-                dragDom.style.width = elW - (clientX - e.clientX) * 2 + 'px';
-              }
+              const moveLen = clientX - e.clientX;
+              setDragDomWidth(EloffsetLeft, elW - moveLen);
             } // 往右拖拽
 
 
             if (clientX < e.clientX) {
-              dragDom.style.width = elW + (e.clientX - clientX) * 2 + 'px';
+              const moveLen = e.clientX - clientX;
+              setDragDomWidth(EloffsetLeft, elW + moveLen);
             }
           } // 底部鼠标拖拽位置
 
 
           if (ELscrollTop + clientY > EloffsetTop + elH - 20 && ELscrollTop + clientY < EloffsetTop + elH) {
-            // 往上拖拽
+            dragDom.style.userSelect = 'none'; // 往上拖拽
+
             if (clientY > e.clientY) {
-              if (dragDom.clientHeight < minHeight) {
-                console.log();
-              } else {
-                dragDom.style.height = elH - (clientY - e.clientY) * 2 + 'px';
-              }
+              const moveLen = clientY - e.clientY;
+              setDragDomHeight(elH - moveLen);
             } // 往下拖拽
 
 
             if (clientY < e.clientY) {
-              dragDom.style.height = elH + (e.clientY - clientY) * 2 + 'px';
+              const moveLen = e.clientY - clientY;
+              setDragDomHeight(elH + moveLen);
             }
           }
         }; // 拉伸结束
 
 
         document.onmouseup = function (e) {
+          dragDom.style.userSelect = 'auto';
           document.onmousemove = null;
           document.onmouseup = null;
         };
@@ -142449,15 +142505,15 @@ function resize(el, binding, value) {
 }
 ;// CONCATENATED MODULE: ./src/directives/modules/el-dialog-drag/js/full.js
 /** 弹框支持全屏 */
-function fullScreen(el, binding, vnode) {
-  //当前宽高
+function fullScreen(el, binding, vNode) {
+  const timeout = 0.3;
   let nowWidth = 0;
-  let nowHight = 0; //当前顶部高度
-
+  let nowHight = 0;
   let nowMarginTop = 0;
+  let nowMarginLeft = 0;
   let isFullScreen = false;
-  const dialogHeaderEl = el.querySelector('.el-dialog__header');
   const dragDom = el.querySelector('.el-dialog');
+  const dialogHeaderEl = el.querySelector('.el-dialog__header');
 
   dialogHeaderEl.ondblclick = e => {
     if (isFullScreen == false) {
@@ -142465,19 +142521,27 @@ function fullScreen(el, binding, vnode) {
       nowHight = dragDom.clientHeight;
       nowWidth = dragDom.clientWidth;
       nowMarginTop = dragDom.style.marginTop;
+      nowMarginLeft = dragDom.style.marginLeft;
       dragDom.style.left = 0;
       dragDom.style.top = 0;
       dragDom.style.height = '100vh';
       dragDom.style.width = '100vw';
       dragDom.style.marginTop = 0;
-      dialogHeaderEl.style.cursor = 'initial'; // TODO: dialogHeaderEl.onmousedown = null
+      dragDom.style.marginLeft = 0;
+      dialogHeaderEl.style.cursor = 'initial';
     } else {
       isFullScreen = false;
-      dragDom.style.height = 'auto';
       dragDom.style.width = nowWidth + 'px';
+      dragDom.style.height = nowHight + 'px';
       dragDom.style.marginTop = nowMarginTop;
-      dialogHeaderEl.style.cursor = 'move'; // TODO: dialogHeaderEl.onmousedown = moveDown
+      dragDom.style.marginLeft = nowMarginLeft;
+      dialogHeaderEl.style.cursor = 'move';
     }
+
+    dragDom.style.transition = `all ${timeout}s linear`;
+    setTimeout(() => {
+      dragDom.style.transition = 'none';
+    }, timeout * 1000);
   };
 }
 ;// CONCATENATED MODULE: ./src/directives/modules/el-dialog-drag/index.js
@@ -142488,14 +142552,17 @@ function fullScreen(el, binding, vnode) {
 
 
 
+
 const ElDialogDrag = {
-  bind(el, binding, vnode) {
-    // 弹框可拖拽
-    drag(el, binding, vnode); // 弹框可拖拽大小
+  bind(el, binding, vNode) {
+    // 弹框初始化
+    init(el, binding, vNode); // 弹框可拖拽
 
-    resize(el, binding, vnode); // 弹框可全屏
+    drag(el, binding, vNode); // 弹框可拖拽大小
 
-    fullScreen(el, binding, vnode);
+    resize(el, binding, vNode); // 弹框可全屏
+
+    fullScreen(el, binding, vNode);
   }
 
 };
@@ -244332,8 +244399,8 @@ var push_down_component = (0,componentNormalizer/* default */.Z)(
 
   }
 });
-// EXTERNAL MODULE: ./src/directives/index.js + 31 modules
-var directives = __webpack_require__(7183);
+// EXTERNAL MODULE: ./src/directives/index.js + 33 modules
+var directives = __webpack_require__(65146);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-40.use[1]!./node_modules/@vue/cli-service/node_modules/@vue/vue-loader-v15/lib/index.js??vue-loader-options!./package/t-data-list/main.vue?vue&type=script&lang=js&
 //
 //
@@ -249372,8 +249439,8 @@ const components = [package_t_input, svg_icon, package_tf_widget, package_tf_lay
 const install = function (Vue) {
   components.forEach(component => {
     Vue.component(component.name, component);
-  }); // Vue.directive('elDialogDrag', ElDialogDrag)
-
+  });
+  Vue.directive('elDialogDrag', directives/* ElDialogDrag */.Lh);
   Vue.directive('umyColumnWidth', directives/* umyColumnWidth */.AB);
   Vue.directive('umyTableSetting', directives/* umyTableSetting */.b$);
   Vue.directive('tableAutoHeight', directives/* tableAutoHeight */.Cq);