vxe-table 3.18.12 → 3.18.14

package/packages/toolbar/src/toolbar.ts

@@ -249,7 +249,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
       if ($xeGGWrapper) {
         $xeGGWrapper.triggerZoomEvent($event)
       } else {
-        warnLog('vxe.error.notProp', ['zoom'])
+        warnLog('vxe.error.notProp', ['[toolbar] zoom'])
       }
     },
     importEvent () {
@@ -383,7 +383,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
               if (tCommandMethod) {
                 tCommandMethod(params)
               } else {
-                errLog('vxe.error.notCommands', [code])
+                errLog('vxe.error.notCommands', [`[toolbar] ${code}`])
               }
             }
             $xeToolbar.dispatchEvent('button-click', params, $event)
@@ -414,7 +414,7 @@ export default /* define-vxe-component start */ defineVxeComponent({
               if (tCommandMethod) {
                 tCommandMethod(params)
               } else {
-                errLog('vxe.error.notCommands', [code])
+                errLog('vxe.error.notCommands', [`[toolbar] ${code}`])
               }
             }
             $xeToolbar.dispatchEvent('tool-click', params, $event)
@@ -442,22 +442,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
           return VxeUIButtonComponent
             ? h(VxeUIButtonComponent, {
               key: index,
-              props: {
-                disabled: child.disabled,
-                loading: child.loading,
-                type: child.type,
-                mode: child.mode,
-                icon: child.icon,
-                circle: child.circle,
-                round: child.round,
-                status: child.status,
+              props: Object.assign({}, child, {
                 content: child.name,
-                title: child.title,
-                routerLink: child.routerLink,
-                permissionCode: child.permissionCode,
-                prefixTooltip: child.prefixTooltip,
-                suffixTooltip: child.suffixTooltip
-              },
+                options: undefined
+              }),
               on: {
                 click: (eventParams: VxeButtonDefines.ClickEventParams) => isBtn ? $xeToolbar.btnEvent(eventParams, child) : $xeToolbar.tolEvent(eventParams, child)
               }
@@ -507,25 +495,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
               if (VxeUIButtonComponent) {
                 btnVNs.push(
                   h(VxeUIButtonComponent, {
-                    props: {
-                      disabled: item.disabled,
-                      loading: item.loading,
-                      type: item.type,
-                      mode: item.mode,
-                      icon: item.icon,
-                      circle: item.circle,
-                      round: item.round,
-                      status: item.status,
+                    props: Object.assign({}, item, {
                       content: item.name,
-                      title: item.title,
-                      routerLink: item.routerLink,
-                      permissionCode: item.permissionCode,
-                      prefixTooltip: item.prefixTooltip,
-                      suffixTooltip: item.suffixTooltip,
-                      destroyOnClose: item.destroyOnClose,
-                      placement: item.placement,
-                      transfer: item.transfer
-                    },
+                      options: undefined
+                    }),
                     on: {
                       click: (eventParams: VxeButtonDefines.ClickEventParams) => $xeToolbar.btnEvent(eventParams, item)
                     },
@@ -589,25 +562,10 @@ export default /* define-vxe-component start */ defineVxeComponent({
                 btnVNs.push(
                   h(VxeUIButtonComponent, {
                     key: tIndex,
-                    props: {
-                      disabled: item.disabled,
-                      loading: item.loading,
-                      type: item.type,
-                      mode: item.mode,
-                      icon: item.icon,
-                      circle: item.circle,
-                      round: item.round,
-                      status: item.status,
+                    props: Object.assign({}, item, {
                       content: item.name,
-                      title: item.title,
-                      routerLink: item.routerLink,
-                      permissionCode: item.permissionCode,
-                      prefixTooltip: item.prefixTooltip,
-                      suffixTooltip: item.suffixTooltip,
-                      destroyOnClose: item.destroyOnClose,
-                      placement: item.placement,
-                      transfer: item.transfer
-                    },
+                      options: undefined
+                    }),
                     on: {
                       click: (eventParams: VxeButtonDefines.ClickEventParams) => $xeToolbar.tolEvent(eventParams, item)
                     },
@@ -827,26 +785,26 @@ export default /* define-vxe-component start */ defineVxeComponent({
       const $xeTable = $xeToolbar.fintTable() as any
       const queryMethod = refreshOpts.queryMethod || refreshOpts.query
       if (props.refresh && !$xeGGWrapper && !queryMethod) {
-        warnLog('vxe.error.notFunc', ['queryMethod'])
+        warnLog('vxe.error.notFunc', ['[toolbar] queryMethod'])
       }
 
       if (XEUtils.isPlainObject(props.custom)) {
-        warnLog('vxe.error.delProp', ['custom={...}', 'custom=boolean & custom-options={...}'])
+        warnLog('vxe.error.delProp', ['[toolbar] custom={...}', 'custom=boolean & custom-options={...}'])
       }
       if (XEUtils.isPlainObject(props.print)) {
-        warnLog('vxe.error.delProp', ['print={...}', 'print=boolean & print-options={...}'])
+        warnLog('vxe.error.delProp', ['[toolbar] print={...}', 'print=boolean & print-options={...}'])
       }
       if (XEUtils.isPlainObject(props.export)) {
-        warnLog('vxe.error.delProp', ['export={...}', 'export=boolean & export-options={...}'])
+        warnLog('vxe.error.delProp', ['[toolbar] export={...}', 'export=boolean & export-options={...}'])
       }
       if (XEUtils.isPlainObject(props.import)) {
-        warnLog('vxe.error.delProp', ['import={...}', 'import=boolean & import-options={...}'])
+        warnLog('vxe.error.delProp', ['[toolbar] import={...}', 'import=boolean & import-options={...}'])
       }
       if (XEUtils.isPlainObject(props.refresh)) {
-        warnLog('vxe.error.delProp', ['refresh={...}', 'refresh=boolean & refresh-options={...}'])
+        warnLog('vxe.error.delProp', ['[toolbar] refresh={...}', 'refresh=boolean & refresh-options={...}'])
       }
       if (XEUtils.isPlainObject(props.refresh)) {
-        warnLog('vxe.error.delProp', ['zoom={...}', 'zoom=boolean & zoom-options={...}'])
+        warnLog('vxe.error.delProp', ['[toolbar] zoom={...}', 'zoom=boolean & zoom-options={...}'])
       }
 
       if ($xeTable) {
@@ -854,16 +812,16 @@ export default /* define-vxe-component start */ defineVxeComponent({
       }
       const customOpts = $xeToolbar.computeCustomOpts
       if (customOpts.isFooter) {
-        warnLog('vxe.error.delProp', ['toolbar.custom.isFooter', 'table.custom-config.showFooter'])
+        warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.isFooter', 'table.custom-config.showFooter'])
       }
       if (customOpts.showFooter) {
-        warnLog('vxe.error.delProp', ['toolbar.custom.showFooter', 'table.custom-config.showFooter'])
+        warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.showFooter', 'table.custom-config.showFooter'])
       }
       if (customOpts.immediate) {
-        warnLog('vxe.error.delProp', ['toolbar.custom.immediate', 'table.custom-config.immediate'])
+        warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.immediate', 'table.custom-config.immediate'])
       }
       if (customOpts.trigger) {
-        warnLog('vxe.error.delProp', ['toolbar.custom.trigger', 'table.custom-config.trigger'])
+        warnLog('vxe.error.delProp', ['[toolbar] toolbar.custom.trigger', 'table.custom-config.trigger'])
       }
     })