vxe-table 3.13.17 → 3.13.19

package/packages/grid/src/grid.ts

@@ -76,9 +76,7 @@ function getFuncSlot ($xeGrid: any, optSlots: any, slotKey: any) {
       if (slots[funcSlot]) {
         return slots[funcSlot]
       } else {
-        if (process.env.VUE_APP_VXE_ENV === 'development') {
-          errLog('vxe.error.notSlot', [funcSlot])
-        }
+        errLog('vxe.error.notSlot', [funcSlot])
       }
     } else {
       return funcSlot
@@ -580,36 +578,32 @@ export default {
     //   errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
     // }
 
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      if (this.toolbar) {
-        warnLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config'])
-      }
-      if (this.toolbarConfig && !XEUtils.isObject(this.toolbarConfig)) {
-        warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}'])
-      }
-      // if (proxyOpts.props) {
-      //   warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
-      // }
+    if (this.toolbar) {
+      warnLog('vxe.error.delProp', ['grid.toolbar', 'grid.toolbar-config'])
     }
+    if (this.toolbarConfig && !XEUtils.isObject(this.toolbarConfig)) {
+      warnLog('vxe.error.errProp', [`grid.toolbar-config=${this.toolbarConfig}`, 'grid.toolbar-config={}'])
+    }
+    // if (proxyOpts.props) {
+    //   warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])
+    // }
 
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      // 使用已安装的组件，如果未安装则不渲染
-      const VxeUIFormComponent = VxeUI.getComponent<VxeFormComponent>('VxeForm')
-      const VxeUIPagerComponent = VxeUI.getComponent<VxePagerComponent>('VxePager')
+    // 使用已安装的组件，如果未安装则不渲染
+    const VxeUIFormComponent = VxeUI.getComponent<VxeFormComponent>('VxeForm')
+    const VxeUIPagerComponent = VxeUI.getComponent<VxePagerComponent>('VxePager')
 
-      $xeGrid.$nextTick(() => {
-        if (props.formConfig) {
-          if (!VxeUIFormComponent) {
-            errLog('vxe.error.reqComp', ['vxe-form'])
-          }
+    $xeGrid.$nextTick(() => {
+      if (props.formConfig) {
+        if (!VxeUIFormComponent) {
+          errLog('vxe.error.reqComp', ['vxe-form'])
         }
-        if (props.pagerConfig) {
-          if (!VxeUIPagerComponent) {
-            errLog('vxe.error.reqComp', ['vxe-pager'])
-          }
+      }
+      if (props.pagerConfig) {
+        if (!VxeUIPagerComponent) {
+          errLog('vxe.error.reqComp', ['vxe-pager'])
         }
-      })
-    }
+      }
+    })
 
     this.initPages()
     globalEvents.on(this, 'keydown', this.handleGlobalKeydownEvent)
@@ -898,9 +892,7 @@ export default {
                 return { status: false }
               })
           } else {
-            if (process.env.VUE_APP_VXE_ENV === 'development') {
-              errLog('vxe.error.notFunc', ['proxy-config.ajax.query'])
-            }
+            errLog('vxe.error.notFunc', ['proxy-config.ajax.query'])
           }
           break
         }
@@ -926,10 +918,8 @@ export default {
                     $xetable.setPendingRow(removeRecords, false)
                     if (isRespMsg) {
                       // 检测弹窗模块
-                      if (process.env.VUE_APP_VXE_ENV === 'development') {
-                        if (!VxeUI.modal) {
-                          errLog('vxe.error.reqModule', ['Modal'])
-                        }
+                      if (!VxeUI.modal) {
+                        errLog('vxe.error.reqModule', ['Modal'])
                       }
                       VxeUI.modal.message({ content: this.getRespMsg(rest, 'vxe.grid.delSuccess'), status: 'success' })
                     }
@@ -947,10 +937,8 @@ export default {
                     this.tableLoading = false
                     if (isRespMsg) {
                       // 检测弹窗模块
-                      if (process.env.VUE_APP_VXE_ENV === 'development') {
-                        if (!VxeUI.modal) {
-                          errLog('vxe.error.reqModule', ['Modal'])
-                        }
+                      if (!VxeUI.modal) {
+                        errLog('vxe.error.reqModule', ['Modal'])
                       }
                       VxeUI.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                     }
@@ -963,18 +951,14 @@ export default {
             } else {
               if (isActiveMsg) {
                 // 检测弹窗模块
-                if (process.env.VUE_APP_VXE_ENV === 'development') {
-                  if (!VxeUI.modal) {
-                    errLog('vxe.error.reqModule', ['Modal'])
-                  }
+                if (!VxeUI.modal) {
+                  errLog('vxe.error.reqModule', ['Modal'])
                 }
                 VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' })
               }
             }
           } else {
-            if (process.env.VUE_APP_VXE_ENV === 'development') {
-              errLog('vxe.error.notFunc', ['proxy-config.ajax.delete'])
-            }
+            errLog('vxe.error.notFunc', ['proxy-config.ajax.delete'])
           }
           break
         }
@@ -1013,10 +997,8 @@ export default {
                     $xetable.clearPendingRow()
                     if (isRespMsg) {
                       // 检测弹窗模块
-                      if (process.env.VUE_APP_VXE_ENV === 'development') {
-                        if (!VxeUI.modal) {
-                          errLog('vxe.error.reqModule', ['Modal'])
-                        }
+                      if (!VxeUI.modal) {
+                        errLog('vxe.error.reqModule', ['Modal'])
                       }
                       VxeUI.modal.message({ content: this.getRespMsg(rest, 'vxe.grid.saveSuccess'), status: 'success' })
                     }
@@ -1034,10 +1016,8 @@ export default {
                     this.tableLoading = false
                     if (isRespMsg) {
                       // 检测弹窗模块
-                      if (process.env.VUE_APP_VXE_ENV === 'development') {
-                        if (!VxeUI.modal) {
-                          errLog('vxe.error.reqModule', ['Modal'])
-                        }
+                      if (!VxeUI.modal) {
+                        errLog('vxe.error.reqModule', ['Modal'])
                       }
                       VxeUI.modal.message({ id: code, content: this.getRespMsg(rest, 'vxe.grid.operError'), status: 'error' })
                     }
@@ -1049,19 +1029,15 @@ export default {
               } else {
                 if (isActiveMsg) {
                   // 检测弹窗模块
-                  if (process.env.VUE_APP_VXE_ENV === 'development') {
-                    if (!VxeUI.modal) {
-                      errLog('vxe.error.reqModule', ['Modal'])
-                    }
+                  if (!VxeUI.modal) {
+                    errLog('vxe.error.reqModule', ['Modal'])
                   }
                   VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.dataUnchanged'), status: 'info' })
                 }
               }
             })
           } else {
-            if (process.env.VUE_APP_VXE_ENV === 'development') {
-              errLog('vxe.error.notFunc', ['proxy-config.ajax.save'])
-            }
+            errLog('vxe.error.notFunc', ['proxy-config.ajax.save'])
           }
           break
         }
@@ -1071,9 +1047,7 @@ export default {
             if (gCommandOpts.commandMethod) {
               gCommandOpts.commandMethod({ code, button, $grid: this, $table: $xetable }, ...args)
             } else {
-              if (process.env.VUE_APP_VXE_ENV === 'development') {
-                errLog('vxe.error.notCommands', [code])
-              }
+              errLog('vxe.error.notCommands', [code])
             }
           }
         }
@@ -1100,10 +1074,8 @@ export default {
           })
         } else {
           // 检测弹窗模块
-          if (process.env.VUE_APP_VXE_ENV === 'development') {
-            if (!VxeUI.modal) {
-              errLog('vxe.error.reqModule', ['Modal'])
-            }
+          if (!VxeUI.modal) {
+            errLog('vxe.error.reqModule', ['Modal'])
           }
           VxeUI.modal.message({ id: `msg_${code}`, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' })
         }
@@ -1151,10 +1123,8 @@ export default {
       } else {
         if (isActiveMsg) {
           // 检测弹窗模块
-          if (process.env.VUE_APP_VXE_ENV === 'development') {
-            if (!VxeUI.modal) {
-              errLog('vxe.error.reqModule', ['Modal'])
-            }
+          if (!VxeUI.modal) {
+            errLog('vxe.error.reqModule', ['Modal'])
           }
           VxeUI.modal.message({ id: code, content: getI18n('vxe.grid.selectOneRecord'), status: 'warning' })
         }

package/packages/table/module/custom/panel.ts

@@ -844,34 +844,32 @@ export default {
   computed: {
   },
   created (this: any) {
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      const VxeUIModalComponent = VxeUI.getComponent<VxeModalComponent>('VxeModal')
-      const VxeUIDrawerComponent = VxeUI.getComponent<VxeDrawerComponent>('VxeDrawer')
-      const VxeUIButtonComponent = VxeUI.getComponent<VxeButtonComponent>('VxeButton')
-      const VxeUINumberInputComponent = VxeUI.getComponent<VxeInputComponent>('VxeNumberInput')
-      const VxeUIRadioGroupComponent = VxeUI.getComponent<VxeRadioGroupComponent>('VxeRadioGroup')
+    const VxeUIModalComponent = VxeUI.getComponent<VxeModalComponent>('VxeModal')
+    const VxeUIDrawerComponent = VxeUI.getComponent<VxeDrawerComponent>('VxeDrawer')
+    const VxeUIButtonComponent = VxeUI.getComponent<VxeButtonComponent>('VxeButton')
+    const VxeUINumberInputComponent = VxeUI.getComponent<VxeInputComponent>('VxeNumberInput')
+    const VxeUIRadioGroupComponent = VxeUI.getComponent<VxeRadioGroupComponent>('VxeRadioGroup')
 
-      this.$nextTick(() => {
-        const { $xetable } = this
-        const { customOpts } = $xetable
-        const { mode } = customOpts
-        if (!VxeUIModalComponent) {
-          errLog('vxe.error.reqComp', ['vxe-modal'])
-        }
-        if (!VxeUIDrawerComponent && (mode === 'drawer')) {
-          errLog('vxe.error.reqComp', ['vxe-drawer'])
-        }
-        if (!VxeUIButtonComponent) {
-          errLog('vxe.error.reqComp', ['vxe-button'])
-        }
-        if (!VxeUINumberInputComponent) {
-          errLog('vxe.error.reqComp', ['vxe-input'])
-        }
-        if (!VxeUIRadioGroupComponent) {
-          errLog('vxe.error.reqComp', ['vxe-radio-group'])
-        }
-      })
-    }
+    this.$nextTick(() => {
+      const { $xetable } = this
+      const { customOpts } = $xetable
+      const { mode } = customOpts
+      if (!VxeUIModalComponent) {
+        errLog('vxe.error.reqComp', ['vxe-modal'])
+      }
+      if (!VxeUIDrawerComponent && (mode === 'drawer')) {
+        errLog('vxe.error.reqComp', ['vxe-drawer'])
+      }
+      if (!VxeUIButtonComponent) {
+        errLog('vxe.error.reqComp', ['vxe-button'])
+      }
+      if (!VxeUINumberInputComponent) {
+        errLog('vxe.error.reqComp', ['vxe-input'])
+      }
+      if (!VxeUIRadioGroupComponent) {
+        errLog('vxe.error.reqComp', ['vxe-radio-group'])
+      }
+    })
   },
   render (this: any, h: CreateElement) {
     const $xeTable = this.$xeTable

package/packages/table/module/edit/mixin.ts

@@ -162,11 +162,9 @@ function handleInsertRowAt ($xeTable: any, records: any[], targetRow: any, isIns
           const parentLevel = parentRest ? parentRest.level : 0
           newRecords.forEach((item: any, i: any) => {
             const rowid = getRowid($xeTable, item)
-            if (process.env.VUE_APP_VXE_ENV === 'development') {
-              if (item[treeOpts.parentField]) {
-                if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
-                  errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`])
-                }
+            if (item[treeOpts.parentField]) {
+              if (parentRow && item[treeOpts.parentField] !== parentRow[rowField]) {
+                errLog('vxe.error.errProp', [`${treeOpts.parentField}=${item[treeOpts.parentField]}`, `${treeOpts.parentField}=${parentRow[rowField]}`])
               }
             }
             if (parentRow) {

package/packages/table/module/export/export-panel.ts

@@ -59,31 +59,29 @@ export default {
   created (this: any) {
     const $xeTableExportPanel = this
 
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      const VxeUIModalComponent = VxeUI.getComponent<VxeModalComponent>('VxeModal')
-      const VxeUIButtonComponent = VxeUI.getComponent<VxeButtonComponent>('VxeButton')
-      const VxeUISelectComponent = VxeUI.getComponent<VxeSelectComponent>('VxeSelect')
-      const VxeUIInputComponent = VxeUI.getComponent<VxeInputComponent>('VxeInput')
-      const VxeUICheckboxComponent = VxeUI.getComponent<VxeCheckboxComponent>('VxeCheckbox')
+    const VxeUIModalComponent = VxeUI.getComponent<VxeModalComponent>('VxeModal')
+    const VxeUIButtonComponent = VxeUI.getComponent<VxeButtonComponent>('VxeButton')
+    const VxeUISelectComponent = VxeUI.getComponent<VxeSelectComponent>('VxeSelect')
+    const VxeUIInputComponent = VxeUI.getComponent<VxeInputComponent>('VxeInput')
+    const VxeUICheckboxComponent = VxeUI.getComponent<VxeCheckboxComponent>('VxeCheckbox')
 
-      $xeTableExportPanel.$nextTick(() => {
-        if (!VxeUIModalComponent) {
-          errLog('vxe.error.reqComp', ['vxe-modal'])
-        }
-        if (!VxeUIButtonComponent) {
-          errLog('vxe.error.reqComp', ['vxe-button'])
-        }
-        if (!VxeUISelectComponent) {
-          errLog('vxe.error.reqComp', ['vxe-select'])
-        }
-        if (!VxeUIInputComponent) {
-          errLog('vxe.error.reqComp', ['vxe-input'])
-        }
-        if (!VxeUICheckboxComponent) {
-          errLog('vxe.error.reqComp', ['vxe-checkbox'])
-        }
-      })
-    }
+    $xeTableExportPanel.$nextTick(() => {
+      if (!VxeUIModalComponent) {
+        errLog('vxe.error.reqComp', ['vxe-modal'])
+      }
+      if (!VxeUIButtonComponent) {
+        errLog('vxe.error.reqComp', ['vxe-button'])
+      }
+      if (!VxeUISelectComponent) {
+        errLog('vxe.error.reqComp', ['vxe-select'])
+      }
+      if (!VxeUIInputComponent) {
+        errLog('vxe.error.reqComp', ['vxe-input'])
+      }
+      if (!VxeUICheckboxComponent) {
+        errLog('vxe.error.reqComp', ['vxe-checkbox'])
+      }
+    })
   },
   render (this: any, h: CreateElement) {
     const $xeTable = this.$xeTable

package/packages/table/module/export/import-panel.ts

@@ -51,23 +51,21 @@ export default {
   created (this: any) {
     const $xeTableImportPanel = this
 
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      const VxeUIModalComponent = VxeUI.getComponent<VxeModalComponent>('VxeModal')
-      const VxeUIButtonComponent = VxeUI.getComponent<VxeButtonComponent>('VxeButton')
-      const VxeUISelectComponent = VxeUI.getComponent<VxeSelectComponent>('VxeSelect')
+    const VxeUIModalComponent = VxeUI.getComponent<VxeModalComponent>('VxeModal')
+    const VxeUIButtonComponent = VxeUI.getComponent<VxeButtonComponent>('VxeButton')
+    const VxeUISelectComponent = VxeUI.getComponent<VxeSelectComponent>('VxeSelect')
 
-      $xeTableImportPanel.$nextTick(() => {
-        if (!VxeUIModalComponent) {
-          errLog('vxe.error.reqComp', ['vxe-modal'])
-        }
-        if (!VxeUIButtonComponent) {
-          errLog('vxe.error.reqComp', ['vxe-button'])
-        }
-        if (!VxeUISelectComponent) {
-          errLog('vxe.error.reqComp', ['vxe-select'])
-        }
-      })
-    }
+    $xeTableImportPanel.$nextTick(() => {
+      if (!VxeUIModalComponent) {
+        errLog('vxe.error.reqComp', ['vxe-modal'])
+      }
+      if (!VxeUIButtonComponent) {
+        errLog('vxe.error.reqComp', ['vxe-button'])
+      }
+      if (!VxeUISelectComponent) {
+        errLog('vxe.error.reqComp', ['vxe-select'])
+      }
+    })
   },
   render (this: any, h: CreateElement) {
     const $xeTable = this.$xeTable

package/packages/table/module/export/mixin.ts

@@ -599,10 +599,8 @@ function downloadFile ($xetable: any, opts: any, content: any) {
   saveLocalFile({ filename, type, content }).then(() => {
     if (opts.message !== false) {
       // 检测弹窗模块
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (!VxeUI.modal) {
-          errLog('vxe.error.reqModule', ['Modal'])
-        }
+      if (!VxeUI.modal) {
+        errLog('vxe.error.reqModule', ['Modal'])
       }
       VxeUI.modal.message({ content: getI18n('vxe.table.expSuccess'), status: 'success' })
     }
@@ -865,10 +863,8 @@ function handleImport ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, c
         }
         if (opts.message !== false) {
           // 检测弹窗模块
-          if (process.env.VUE_APP_VXE_ENV === 'development') {
-            if (!VxeUI.modal) {
-              errLog('vxe.error.reqModule', ['Modal'])
-            }
+          if (!VxeUI.modal) {
+            errLog('vxe.error.reqModule', ['Modal'])
           }
           VxeUI.modal.message({ content: getI18n('vxe.table.impSuccess', [rows.length]), status: 'success' })
         }
@@ -880,10 +876,8 @@ function handleImport ($xeTable: VxeTableConstructor & VxeTablePrivateMethods, c
       })
   } else if (opts.message !== false) {
     // 检测弹窗模块
-    if (process.env.VUE_APP_VXE_ENV === 'development') {
-      if (!VxeUI.modal) {
-        errLog('vxe.error.reqModule', ['Modal'])
-      }
+    if (!VxeUI.modal) {
+      errLog('vxe.error.reqModule', ['Modal'])
     }
     VxeUI.modal.message({ content: getI18n('vxe.error.impFields'), status: 'error' })
     if (_importReject) {
@@ -901,10 +895,8 @@ function handleFileImport ($xetable: any, file: any, opts: any) {
   if (!importMethod && !XEUtils.includes(XEUtils.keys(importOpts._typeMaps), type)) {
     if (opts.message !== false) {
       // 检测弹窗模块
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (!VxeUI.modal) {
-          errLog('vxe.error.reqModule', ['Modal'])
-        }
+      if (!VxeUI.modal) {
+        errLog('vxe.error.reqModule', ['Modal'])
       }
       VxeUI.modal.message({ content: getI18n('vxe.error.notType', [type]), status: 'error' })
     }
@@ -952,9 +944,7 @@ function handleFileImport ($xetable: any, file: any, opts: any) {
       }
     } else {
       // 不支持的浏览器
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        errLog('vxe.error.notExp')
-      }
+      errLog('vxe.error.notExp')
       _importResolve({ status: true })
     }
   })
@@ -1016,10 +1006,8 @@ export function readLocalFile (options: any = {}) {
       } else {
         if (options.message !== false) {
           // 检测弹窗模块
-          if (process.env.VUE_APP_VXE_ENV === 'development') {
-            if (!VxeUI.modal) {
-              errLog('vxe.error.reqModule', ['Modal'])
-            }
+          if (!VxeUI.modal) {
+            errLog('vxe.error.reqModule', ['Modal'])
           }
           VxeUI.modal.message({ content: getI18n('vxe.error.notType', [errType]), status: 'error' })
         }
@@ -1688,20 +1676,16 @@ export default {
     _closeExport: handleCloseExport,
     _openExport (options: any) {
       const { exportOpts } = this
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (!this.exportConfig) {
-          errLog('vxe.error.reqProp', ['export-config'])
-        }
+      if (!this.exportConfig) {
+        errLog('vxe.error.reqProp', ['export-config'])
       }
       return handleExportAndPrint(this, Object.assign({}, exportOpts, options))
     },
     _closePrint: handleCloseExport,
     _openPrint (options: any) {
       const { printOpts } = this
-      if (process.env.VUE_APP_VXE_ENV === 'development') {
-        if (!this.printConfig) {
-          errLog('vxe.error.reqProp', ['print-config'])
-        }
+      if (!this.printConfig) {
+        errLog('vxe.error.reqProp', ['print-config'])
       }
       return handleExportAndPrint(this, Object.assign({}, printOpts, options), true)
     }

package/packages/table/module/validator/mixin.ts

@@ -356,9 +356,7 @@ export default {
                       }
                     }
                   } else {
-                    if (process.env.VUE_APP_VXE_ENV === 'development') {
-                      errLog('vxe.error.notValidators', [validator])
-                    }
+                    errLog('vxe.error.notValidators', [validator])
                   }
                 } else {
                   customValid = validator(validParams)