vxe-pc-ui 4.6.47 → 4.6.49

package/lib/index.umd.js

@@ -2358,7 +2358,7 @@ if (typeof window !== 'undefined') {
 // EXTERNAL MODULE: ./node_modules/core-js/modules/es.array.push.js
 var es_array_push = __webpack_require__(4114);
 ;// CONCATENATED MODULE: ./node_modules/@vxe-ui/core/es/src/core.js
-const coreVersion = "4.1.3";
+const coreVersion = "4.2.0";
 const VxeCore = {
   coreVersion,
   uiVersion: '',
@@ -2929,7 +2929,7 @@ function createLog(type, name) {
     return msg;
   };
 }
-const version = "4.1.3";
+const version = "4.2.0";
 const log = {
   create: createLog,
   warn: createLog('warn', `v${version}`),
@@ -2958,7 +2958,11 @@ const renderer = {
       const renders = renderMap[name];
       if (renders) {
         // 检测是否覆盖
-        if (false) {}
+        external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(options, (val, key) => {
+          if (!external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().eqNull(renders[key]) && renders[key] !== val) {
+            log.warn('vxe.error.coverProp', [`Renderer.${name}`, key]);
+          }
+        });
         Object.assign(renders, options);
       } else {
         renderMap[name] = options;
@@ -3005,7 +3009,12 @@ class Store {
   add(name, options) {
     const conf = this.store[name];
     // 检测是否覆盖
-    if (false) {}
+    const confKeys = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(conf);
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(options, (item, key) => {
+      if (confKeys.includes(key)) {
+        log.warn('vxe.error.coverProp', [name, key]);
+      }
+    });
     this.store[name] = conf ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, options) : options;
     return this;
   }
@@ -3020,7 +3029,9 @@ class Store {
 ;// CONCATENATED MODULE: ./node_modules/@vxe-ui/core/es/src/validators.js
 
 const validators = new store();
-if (false) {}
+Object.assign(validators, {
+  _name: 'Validators'
+});
 ;// CONCATENATED MODULE: ./node_modules/@vxe-ui/core/es/src/menus.js
 
 
@@ -3049,13 +3060,18 @@ class VXEMenusStore {
     const conf = this.store[name];
     // 兼容
     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
-      if (false) {}
+      log.warn('vxe.error.delProp', ['menus -> callback', 'menuMethod']);
       render = {
         menuMethod: render
       };
     }
     // 检测是否覆盖
-    if (false) {}
+    const confKeys = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(conf);
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(render, (item, key) => {
+      if (confKeys.includes(key)) {
+        log.warn('vxe.error.coverProp', [name, key]);
+      }
+    });
     this.store[name] = conf ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, render) : render;
     return this;
   }
@@ -3067,7 +3083,9 @@ class VXEMenusStore {
   }
 }
 const menus = new VXEMenusStore();
-if (false) {}
+Object.assign(menus, {
+  _name: 'Menus'
+});
 ;// CONCATENATED MODULE: ./node_modules/@vxe-ui/core/es/src/formats.js
 
 
@@ -3096,13 +3114,18 @@ class VXEFormatsStore {
     const conf = this.store[name];
     // 兼容
     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
-      if (false) {}
+      log.warn('vxe.error.delProp', ['formats -> callback', 'cellFormatMethod']);
       render = {
         cellFormatMethod: render
       };
     }
     // 检测是否覆盖
-    if (false) {}
+    const confKeys = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(conf);
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(render, (item, key) => {
+      if (confKeys.includes(key)) {
+        log.warn('vxe.error.coverProp', [name, key]);
+      }
+    });
     this.store[name] = conf ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, render) : render;
     return this;
   }
@@ -3114,7 +3137,9 @@ class VXEFormatsStore {
   }
 }
 const formats = new VXEFormatsStore();
-if (false) {}
+Object.assign(formats, {
+  _name: 'Formats'
+});
 ;// CONCATENATED MODULE: ./node_modules/@vxe-ui/core/es/src/commands.js
 
 
@@ -3143,13 +3168,18 @@ class VXECommandsStore {
     const conf = this.store[name];
     // 兼容
     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
-      if (false) {}
+      log.warn('vxe.error.delProp', ['commands -> callback', 'commandMethod']);
       render = {
         commandMethod: render
       };
     }
     // 检测是否覆盖
-    if (false) {}
+    const confKeys = external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().keys(conf);
+    external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().each(render, (item, key) => {
+      if (confKeys.includes(key)) {
+        log.warn('vxe.error.coverProp', [name, key]);
+      }
+    });
     this.store[name] = conf ? external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().merge(conf, render) : render;
     return this;
   }
@@ -3161,7 +3191,9 @@ class VXECommandsStore {
   }
 }
 const commands = new VXECommandsStore();
-if (false) {}
+Object.assign(commands, {
+  _name: 'Commands'
+});
 ;// CONCATENATED MODULE: ./node_modules/@vxe-ui/core/es/src/interceptor.js
 
 
@@ -3180,9 +3212,7 @@ const interceptor = {
   add(type, render) {
     // 兼容
     if (external_root_XEUtils_commonjs_xe_utils_commonjs2_xe_utils_amd_xe_utils_default().isFunction(render)) {
-      // if (process.env.NODE_ENV === 'development') {
       //   log.warn('vxe.error.delProp', ['interceptor -> callback', 'tableInterceptorMethod'])
-      // }
       render = {
         tableInterceptorMethod: render
       };
@@ -3194,7 +3224,9 @@ const interceptor = {
         eList = storeMap[type] = [];
       }
       // 检测重复
-      if (false) {}
+      if (eList.indexOf(callback) > -1) {
+        log.warn('vxe.error.coverProp', ['Interceptor', type]);
+      }
       eList.push(callback);
     }
     return interceptor;
@@ -4212,10 +4244,10 @@ const dynamicStore = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.reactive)(
  */
 const VxeDynamics = defineVxeComponent({
   setup() {
-    const VxeUIModalComponent = index_esm_VxeUI.getComponent('VxeModal');
-    const VxeUIDrawerComponent = index_esm_VxeUI.getComponent('VxeDrawer');
-    const VxeUILoadingComponent = index_esm_VxeUI.getComponent('VxeLoading');
-    const VxeUIWatermarkComponent = index_esm_VxeUI.getComponent('VxeWatermark');
+    const VxeUIModalComponent = index_esm_VxeUI.getComponent('vxe-modal');
+    const VxeUIDrawerComponent = index_esm_VxeUI.getComponent('vxe-drawer');
+    const VxeUILoadingComponent = index_esm_VxeUI.getComponent('vxe-loading');
+    const VxeUIWatermarkComponent = index_esm_VxeUI.getComponent('vxe-watermark');
     return () => {
       const {
         modals,
@@ -4244,14 +4276,14 @@ function checkDynamic() {
 }
 ;// CONCATENATED MODULE: ./packages/ui/src/log.ts
 
-const log_version = `ui v${"4.6.47"}`;
+const log_version = `ui v${"4.6.49"}`;
 const warnLog = log.create('warn', log_version);
 const errLog = log.create('error', log_version);
 ;// CONCATENATED MODULE: ./packages/ui/index.ts
 
 
 
-const ui_version = "4.6.47";
+const ui_version = "4.6.49";
 index_esm_VxeUI.uiVersion = ui_version;
 index_esm_VxeUI.dynamicApp = dynamicApp;
 function config(options) {
@@ -31406,7 +31438,7 @@ const WidgetSubtableViewComponent = defineVxeComponent({
   },
   emits: [],
   setup(props) {
-    const VxeTableGridComponent = index_esm_VxeUI.getComponent('VxeGrid');
+    const VxeTableGridComponent = index_esm_VxeUI.getComponent('vxe-grid');
     const $xeFormView = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeFormView', null);
     const {
       computeKebabCaseName
@@ -42524,7 +42556,7 @@ const default_setting_data_getDefaultSettingFormData = () => {
   props: {},
   emits: [],
   setup() {
-    const VxeTableGridComponent = index_esm_VxeUI.getComponent('VxeGrid');
+    const VxeTableGridComponent = index_esm_VxeUI.getComponent('vxe-grid');
     const $xeListDesign = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeListDesign', null);
     if (!$xeListDesign) {
       return () => [];
@@ -43892,7 +43924,7 @@ const ListDesign = VxeListDesign;
   },
   emits: ['cell-action', 'update:formData', 'update:actionButtons'],
   setup(props, context) {
-    const VxeTableGridComponent = index_esm_VxeUI.getComponent('VxeGrid');
+    const VxeTableGridComponent = index_esm_VxeUI.getComponent('vxe-grid');
     const {
       emit,
       slots
@@ -47083,7 +47115,7 @@ function createHtmlPage(opts, printHtml) {
   const footStyOpts = pageStyObj.header;
   const pnStyOpts = pageStyObj.pageNumber;
   const isPbMode = opts._pageBreaks || opts.pageBreaks && opts.pageBreaks.length;
-  return ['<!DOCTYPE html><html>', '<head>', '<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,minimal-ui">', `<title>${opts.title || ''}</title>`, '<style media="print">@page{size:auto;margin: 0mm;}</style>', `<style>body{font-size:${pageStyObj.fontSize || '14px'};color:${pageStyObj.color || defaultFontColor};text-align:${pageStyObj.textAlign || 'left'};}</style>`, '<style>', '.vxe-print-slots{display:none;}', '.vxe-print-page-break.align--center{text-align:center;}', '.vxe-print-page-break.align--left{text-align:left;}', '.vxe-print-page-break.align--right{text-align:right;}', '.vxe-print-page-break{break-before:always;page-break-before:always;display:flex;flex-direction:column;height:100vh;overflow:hidden;}', '.vxe-print-page-break--body{display:flex;flex-direction:row;flex-grow:1;overflow:hidden;}', '.vxe-print-page-break--left,.vxe-print-page-break--right{flex-shrink:0;height:100%;}', `.vxe-print-page-break--left{width:${pageStyObj.marginLeft};}`, `.vxe-print-page-break--right{width:${pageStyObj.marginRight};}`, '.vxe-print-page-break--header,.vxe-print-page-break--footer{display:flex;justify-content:center;flex-direction:column;flex-shrink:0;width:100%;}', `.vxe-print-page-break--header{height:${headStyOpts.height || pageStyObj.marginTop};padding:0 ${pageStyObj.marginLeft} 0 ${pageStyObj.marginRight};text-align:${headStyOpts.textAlign || 'left'};}`, `.vxe-print-page-break--header-title{font-size:${titStyOpts.fontSize || '1.6em'};color:${titStyOpts.color || defaultFontColor};text-align:${opts.headerAlign || pnStyOpts.textAlign || 'center'};}`, `.vxe-print-page-break--footer{height:${footStyOpts.height || pageStyObj.marginBottom};padding:0 ${pageStyObj.marginLeft} 0 ${pageStyObj.marginRight};text-align:${footStyOpts.textAlign || 'left'};}`, '.vxe-print-page-break--content{flex-grow:1;overflow:hidden;}', `.vxe-print-page-break--footer-page-number{font-size:${pnStyOpts.fontSize || '1.2em'};color:${pnStyOpts.color || defaultFontColor};text-align:${opts.footerAlign || pnStyOpts.textAlign || 'center'};}`, '</style>', '<style>.vxe-table{white-space:pre;}</style>', `<style>${defaultHtmlStyle}</style>`, isPbMode ? '<style>body{margin:0;}</style>' : `<style>body{margin:${pageStyObj.marginTop} ${pageStyObj.marginRight} ${pageStyObj.marginBottom} ${pageStyObj.marginLeft};}</style>`, customStyle ? `<style>${customStyle}</style>` : '', '</head>', '<body>', `${printHtml}`, '</body>', '</html>'].join('');
+  return ['<!DOCTYPE html><html>', '<head>', '<meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no,minimal-ui">', `<title>${opts.title || ''}</title>`, `<style media="print">@page{size:auto;${isPbMode ? 'margin: 0mm;' : ''}}</style>`, `<style>body{font-size:${pageStyObj.fontSize || '14px'};color:${pageStyObj.color || defaultFontColor};text-align:${pageStyObj.textAlign || 'left'};}</style>`, '<style>', '.vxe-print-slots{display:none;}', '.vxe-print-page-break.align--center{text-align:center;}', '.vxe-print-page-break.align--left{text-align:left;}', '.vxe-print-page-break.align--right{text-align:right;}', '.vxe-print-page-break{break-before:always;page-break-before:always;display:flex;flex-direction:column;height:100vh;overflow:hidden;}', '.vxe-print-page-break--body{display:flex;flex-direction:row;flex-grow:1;overflow:hidden;}', '.vxe-print-page-break--left,.vxe-print-page-break--right{flex-shrink:0;height:100%;}', `.vxe-print-page-break--left{width:${pageStyObj.marginLeft};}`, `.vxe-print-page-break--right{width:${pageStyObj.marginRight};}`, '.vxe-print-page-break--header,.vxe-print-page-break--footer{display:flex;justify-content:center;flex-direction:column;flex-shrink:0;width:100%;}', `.vxe-print-page-break--header{height:${headStyOpts.height || pageStyObj.marginTop};padding:0 ${pageStyObj.marginLeft} 0 ${pageStyObj.marginRight};text-align:${headStyOpts.textAlign || 'left'};}`, `.vxe-print-page-break--header-title{font-size:${titStyOpts.fontSize || '1.6em'};color:${titStyOpts.color || defaultFontColor};text-align:${opts.headerAlign || pnStyOpts.textAlign || 'center'};}`, `.vxe-print-page-break--footer{height:${footStyOpts.height || pageStyObj.marginBottom};padding:0 ${pageStyObj.marginLeft} 0 ${pageStyObj.marginRight};text-align:${footStyOpts.textAlign || 'left'};}`, '.vxe-print-page-break--content{flex-grow:1;overflow:hidden;}', `.vxe-print-page-break--footer-page-number{font-size:${pnStyOpts.fontSize || '1.2em'};color:${pnStyOpts.color || defaultFontColor};text-align:${opts.footerAlign || pnStyOpts.textAlign || 'center'};}`, '</style>', '<style>.vxe-table{white-space:pre;}</style>', `<style>${defaultHtmlStyle}</style>`, isPbMode ? '<style>body{margin:0;}</style>' : '', customStyle ? `<style>${customStyle}</style>` : '', '</head>', '<body>', `${printHtml}`, '</body>', '</html>'].join('');
 }
 function handlePrint(opts, printHtml = '') {
   const {
@@ -49159,7 +49191,7 @@ function getRowUniqueId() {
       emit,
       slots
     } = context;
-    const VxeTableGridComponent = index_esm_VxeUI.getComponent('VxeGrid');
+    const VxeTableGridComponent = index_esm_VxeUI.getComponent('vxe-grid');
     const $xeModal = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeModal', null);
     const $xeDrawer = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeDrawer', null);
     const $xeTable = (0,external_commonjs_vue_commonjs2_vue_root_Vue_.inject)('$xeTable', null);