vxe-table 4.7.64 → 4.7.66

package/es/grid/src/grid.js

@@ -180,6 +180,13 @@ export default defineComponent({
                 });
             }
         };
+        const getFormData = () => {
+            const { proxyConfig } = props;
+            const { formData } = reactData;
+            const proxyOpts = computeProxyOpts.value;
+            const formOpts = computeFormOpts.value;
+            return proxyConfig && isEnableConf(proxyOpts) && proxyOpts.form ? formData : formOpts.data;
+        };
         const initPages = () => {
             const { tablePage } = reactData;
             const { pagerConfig } = props;
@@ -608,7 +615,7 @@ export default defineComponent({
             const formOpts = computeFormOpts.value;
             if (proxyConfig && isEnableConf(proxyOpts)) {
                 if (formConfig && isEnableConf(formOpts) && proxyOpts.form && formOpts.items) {
-                    const formData = {};
+                    const fData = {};
                     formOpts.items.forEach(item => {
                         const { field, itemRender } = item;
                         if (field) {
@@ -622,10 +629,10 @@ export default defineComponent({
                                     itemValue = defaultValue;
                                 }
                             }
-                            formData[field] = itemValue;
+                            fData[field] = itemValue;
                         }
                     });
-                    reactData.formData = formData;
+                    reactData.formData = fData;
                 }
                 if (!proxyInited) {
                     reactData.proxyInited = true;
@@ -647,7 +654,7 @@ export default defineComponent({
              */
             commitProxy(proxyTarget, ...args) {
                 const { toolbarConfig, pagerConfig, editRules, validConfig } = props;
-                const { tablePage, formData } = reactData;
+                const { tablePage } = reactData;
                 const isActiveMsg = computeIsActiveMsg.value;
                 const isRespMsg = computeIsRespMsg.value;
                 const proxyOpts = computeProxyOpts.value;
@@ -656,6 +663,7 @@ export default defineComponent({
                 const { beforeQuery, afterQuery, beforeDelete, afterDelete, beforeSave, afterSave, ajax = {} } = proxyOpts;
                 const resConfigs = proxyOpts.response || proxyOpts.props || {};
                 const $xeTable = refTable.value;
+                const formData = getFormData();
                 let button = null;
                 let code = null;
                 if (XEUtils.isString(proxyTarget)) {
@@ -980,6 +988,7 @@ export default defineComponent({
             revert() {
                 return handleZoom();
             },
+            getFormData,
             getFormItems(itemIndex) {
                 const formOpts = computeFormOpts.value;
                 const { formConfig } = props;
@@ -997,7 +1006,7 @@ export default defineComponent({
                     return {
                         data: reactData.tableData,
                         filter: reactData.filterData,
-                        form: reactData.formData,
+                        form: getFormData(),
                         sort: sortData.length ? sortData[0] : {},
                         sorts: sortData,
                         pager: reactData.tablePage,
@@ -1145,12 +1154,13 @@ export default defineComponent({
         initPages();
         onMounted(() => {
             nextTick(() => {
-                const { data, columns, proxyConfig } = props;
-                const proxyOpts = computeProxyOpts.value;
-                const formOpts = computeFormOpts.value;
-                if (isEnableConf(proxyConfig) && (data || (proxyOpts.form && formOpts.data))) {
-                    errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config']);
-                }
+                const { columns } = props;
+                // const { data, columns, proxyConfig } = props
+                // const proxyOpts = computeProxyOpts.value
+                // const formOpts = computeFormOpts.value
+                // if (isEnableConf(proxyConfig) && (data || (proxyOpts.form && formOpts.data))) {
+                //   errLog('vxe.error.errConflicts', ['grid.data', 'grid.proxy-config'])
+                // }
                 // if (process.env.NODE_ENV === 'development') {
                 //   if (proxyOpts.props) {
                 //     warnLog('vxe.error.delProp', ['proxy-config.props', 'proxy-config.response'])

package/es/locale/lang/en-US.js

@@ -1,7 +1,3 @@
-/**
- * 已废弃
- * @deprecated
- */
 export default {
     vxe: {
         base: {
@@ -23,7 +19,7 @@ export default {
             useErr: 'Error installing "{0}" module, possibly in the wrong order, dependent modules need to be installed before Table.',
             barUnableLink: 'Toolbar cannot associate table.',
             expandContent: 'Expand row slot should be "content", please check if it is correct.',
-            reqComp: 'Require "{0}" component, check whether the install is correct',
+            reqComp: 'Require "{0}" component, check whether the install is correct. https://vxeui.com/#/start/useGlobal',
             reqModule: 'require "{0}" module.',
             reqProp: 'Missing the necessary "{0}" parameter, which can cause error.',
             emptyProp: 'The property "{0}" is not allowed to be empty.',
@@ -53,6 +49,7 @@ export default {
             emptyText: 'No Data',
             allTitle: 'Select all / cancel',
             seqTitle: 'N/S',
+            actionTitle: 'Action',
             confirmFilter: 'Confirm',
             resetFilter: 'Reset',
             allFilter: 'All',
@@ -309,7 +306,9 @@ export default {
             reUpload: 'Re upload',
             uploadProgress: 'Uploading {0}%',
             uploadErr: 'Fail to upload',
-            uploadSuccess: 'Successfully upload'
+            uploadSuccess: 'Successfully upload',
+            moreBtnText: 'More ({0})',
+            viewItemTitle: 'click to view'
         },
         formDesign: {
             formName: 'Form name',
@@ -340,6 +339,7 @@ export default {
                 group: {
                     base: 'Base control',
                     layout: 'Layout control',
+                    system: 'System control',
                     advanced: 'Advanced control'
                 },
                 copyTitle: 'Copy_{0}',
@@ -348,7 +348,8 @@ export default {
                     textarea: 'Textarea',
                     select: 'Select',
                     row: 'Row/column',
-                    title: 'Text',
+                    title: 'Title',
+                    text: 'Text',
                     subtable: 'Subtable',
                     VxeSwitch: 'Yes/no',
                     VxeInput: 'Input',
@@ -422,7 +423,15 @@ export default {
         },
         listDesign: {
             fieldSettingTab: 'Field setting',
-            listSettingTab: 'List setting'
+            listSettingTab: 'List setting',
+            activeBtn: {
+                ActionButtonUpdate: 'Edit',
+                ActionButtonDelete: 'Delete'
+            }
+        },
+        text: {
+            copySuccess: 'Successfully copied to clipboard.',
+            copyError: 'The current environment does not support this operation.'
         },
         /**
          * 扩展插件

package/es/locale/lang/es-ES.js

@@ -1,7 +1,3 @@
-/**
- * 已废弃
- * @deprecated
- */
 export default {
     vxe: {
         base: {
@@ -23,7 +19,7 @@ export default {
             useErr: 'Error al instalar el módulo "{0}", posiblemente en el orden equivocado, los módulos dependientes deben ser instalados antes de la tabla.',
             barUnableLink: 'La barra de herramientas no puede asociarse con la tabla.',
             expandContent: 'La ranura de fila expandible debería ser "contenido", por favor revise si está correcta.',
-            reqComp: 'Require "{0}" component, check whether the install is correct',
+            reqComp: 'Require "{0}" component, check whether the install is correct. https://vxeui.com/#/start/useGlobal',
             reqModule: 'Requerir el módulo "{0}".',
             reqProp: 'Falta el parámetro necesario "{0}", lo que puede causar errores.',
             emptyProp: 'La propiedad "{0}" no se permite estar vacía.',
@@ -53,6 +49,7 @@ export default {
             emptyText: 'No hay datos',
             allTitle: 'Seleccionar todo / cancelar',
             seqTitle: 'N/S',
+            actionTitle: 'Action',
             confirmFilter: 'Confirmar',
             resetFilter: 'Restablecer',
             allFilter: 'Todo',
@@ -309,7 +306,9 @@ export default {
             reUpload: 'Re upload',
             uploadProgress: 'Uploading {0}%',
             uploadErr: 'Fail to upload',
-            uploadSuccess: 'Successfully upload'
+            uploadSuccess: 'Successfully upload',
+            moreBtnText: 'More ({0})',
+            viewItemTitle: 'click to view'
         },
         formDesign: {
             formName: 'Form name',
@@ -340,6 +339,7 @@ export default {
                 group: {
                     base: 'Base control',
                     layout: 'Layout control',
+                    system: 'System control',
                     advanced: 'Advanced control'
                 },
                 copyTitle: 'Copy_{0}',
@@ -348,7 +348,8 @@ export default {
                     textarea: 'Textarea',
                     select: 'Select',
                     row: 'Row/column',
-                    title: 'Text',
+                    title: 'Title',
+                    text: 'Text',
                     subtable: 'Subtable',
                     VxeSwitch: 'Yes/no',
                     VxeInput: 'Input',
@@ -422,7 +423,15 @@ export default {
         },
         listDesign: {
             fieldSettingTab: 'Field setting',
-            listSettingTab: 'List setting'
+            listSettingTab: 'List setting',
+            activeBtn: {
+                ActionButtonUpdate: 'Edit',
+                ActionButtonDelete: 'Delete'
+            }
+        },
+        text: {
+            copySuccess: 'Successfully copied to clipboard.',
+            copyError: 'The current environment does not support this operation.'
         },
         /**
          * 扩展插件