@tongfun/tf-widget 0.1.153 → 0.1.155

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 + 32 modules
-var directives = __webpack_require__(27499);
+// 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,7 +140831,7 @@ function getVoucherIds(data) {
 
 /***/ }),
 
-/***/ 27499:
+/***/ 65146:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -141073,16 +141073,20 @@ async function initColumnDrag(el, binding, vNode) {
       oldIndex
     }) => {
       const {
-        collectColumn
-      } = tableInstance.getTableColumn();
+        collectColumn,
+        tableColumn
+      } = tableInstance.getTableColumn(); // 转换真实索引
 
-      if (newIndex === oldIndex) {
+      const oldColumnIndex = tableInstance.getColumnIndex(tableColumn[oldIndex]);
+      const newColumnIndex = tableInstance.getColumnIndex(tableColumn[newIndex]);
+
+      if (newColumnIndex === oldColumnIndex) {
         return;
       } // 移动到目标列
 
 
-      const currRow = collectColumn.splice(oldIndex, 1)[0];
-      collectColumn.splice(newIndex, 0, currRow);
+      const currRow = collectColumn.splice(oldColumnIndex, 1)[0];
+      collectColumn.splice(newColumnIndex, 0, currRow);
       tableInstance.loadColumn(collectColumn); // 配置更新
 
       columnChange(el, binding, vNode);
@@ -141109,6 +141113,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_);
@@ -141818,6 +141834,7 @@ var tf_setting_component = (0,componentNormalizer/* default */.Z)(
 
 
 
+
 external_commonjs_vue_commonjs2_vue_root_Vue_default().component('DirectiveColumnHeader', column_header);
 /** 初始化表格配置信息 */
 
@@ -142006,11 +142023,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) {
@@ -142101,19 +142119,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);
 };
@@ -142281,8 +142286,44 @@ 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;
-  dialogInstance.closeOnClickModal = false;
+  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
 /** 弹框支持拖拽 */
@@ -142469,6 +142510,7 @@ function resize(el, binding, vNode) {
 ;// CONCATENATED MODULE: ./src/directives/modules/el-dialog-drag/js/full.js
 /** 弹框支持全屏 */
 function fullScreen(el, binding, vNode) {
+  const timeout = 0.3;
   let nowWidth = 0;
   let nowHight = 0;
   let nowMarginTop = 0;
@@ -142499,6 +142541,11 @@ function fullScreen(el, binding, vNode) {
       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
@@ -244356,8 +244403,8 @@ var push_down_component = (0,componentNormalizer/* default */.Z)(
 
   }
 });
-// EXTERNAL MODULE: ./src/directives/index.js + 32 modules
-var directives = __webpack_require__(27499);
+// 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&
 //
 //

package/lib/tf-widget.umd.js

@@ -140090,8 +140090,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__(68023);
-// EXTERNAL MODULE: ./src/directives/index.js + 32 modules
-var directives = __webpack_require__(6208);
+// EXTERNAL MODULE: ./src/directives/index.js + 33 modules
+var directives = __webpack_require__(2445);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-81.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&
 //
 //
@@ -140841,7 +140841,7 @@ function getVoucherIds(data) {
 
 /***/ }),
 
-/***/ 6208:
+/***/ 2445:
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -141083,16 +141083,20 @@ async function initColumnDrag(el, binding, vNode) {
       oldIndex
     }) => {
       const {
-        collectColumn
-      } = tableInstance.getTableColumn();
+        collectColumn,
+        tableColumn
+      } = tableInstance.getTableColumn(); // 转换真实索引
 
-      if (newIndex === oldIndex) {
+      const oldColumnIndex = tableInstance.getColumnIndex(tableColumn[oldIndex]);
+      const newColumnIndex = tableInstance.getColumnIndex(tableColumn[newIndex]);
+
+      if (newColumnIndex === oldColumnIndex) {
         return;
       } // 移动到目标列
 
 
-      const currRow = collectColumn.splice(oldIndex, 1)[0];
-      collectColumn.splice(newIndex, 0, currRow);
+      const currRow = collectColumn.splice(oldColumnIndex, 1)[0];
+      collectColumn.splice(newColumnIndex, 0, currRow);
       tableInstance.loadColumn(collectColumn); // 配置更新
 
       columnChange(el, binding, vNode);
@@ -141119,6 +141123,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__(77203);
 var external_commonjs_vue_commonjs2_vue_root_Vue_default = /*#__PURE__*/__webpack_require__.n(external_commonjs_vue_commonjs2_vue_root_Vue_);
@@ -141828,6 +141844,7 @@ var tf_setting_component = (0,componentNormalizer/* default */.Z)(
 
 
 
+
 external_commonjs_vue_commonjs2_vue_root_Vue_default().component('DirectiveColumnHeader', column_header);
 /** 初始化表格配置信息 */
 
@@ -142016,11 +142033,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) {
@@ -142111,19 +142129,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);
 };
@@ -142291,8 +142296,44 @@ 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;
-  dialogInstance.closeOnClickModal = false;
+  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
 /** 弹框支持拖拽 */
@@ -142479,6 +142520,7 @@ function resize(el, binding, vNode) {
 ;// CONCATENATED MODULE: ./src/directives/modules/el-dialog-drag/js/full.js
 /** 弹框支持全屏 */
 function fullScreen(el, binding, vNode) {
+  const timeout = 0.3;
   let nowWidth = 0;
   let nowHight = 0;
   let nowMarginTop = 0;
@@ -142509,6 +142551,11 @@ function fullScreen(el, binding, vNode) {
       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
@@ -244366,8 +244413,8 @@ var push_down_component = (0,componentNormalizer/* default */.Z)(
 
   }
 });
-// EXTERNAL MODULE: ./src/directives/index.js + 32 modules
-var directives = __webpack_require__(6208);
+// EXTERNAL MODULE: ./src/directives/index.js + 33 modules
+var directives = __webpack_require__(2445);
 ;// CONCATENATED MODULE: ./node_modules/thread-loader/dist/cjs.js!./node_modules/babel-loader/lib/index.js??clonedRuleSet-81.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&
 //
 //