vxe-table 4.7.65 → 4.7.67

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

@@ -306,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',
@@ -337,6 +339,7 @@ export default {
                 group: {
                     base: 'Base control',
                     layout: 'Layout control',
+                    system: 'System control',
                     advanced: 'Advanced control'
                 },
                 copyTitle: 'Copy_{0}',

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

@@ -306,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',
@@ -337,6 +339,7 @@ export default {
                 group: {
                     base: 'Base control',
                     layout: 'Layout control',
+                    system: 'System control',
                     advanced: 'Advanced control'
                 },
                 copyTitle: 'Copy_{0}',

package/es/locale/lang/hu-HU.js

@@ -305,7 +305,9 @@ export default {
             reUpload: '重新上传',
             uploadProgress: '上传中 {0}%',
             uploadErr: '上传失败',
-            uploadSuccess: '上传成功'
+            uploadSuccess: '上传成功',
+            moreBtnText: '更多（{0}）',
+            viewItemTitle: '点击查看'
         },
         formDesign: {
             formName: '表单名称',
@@ -336,6 +338,7 @@ export default {
                 group: {
                     base: '基础控件',
                     layout: '布局控件',
+                    system: '系统控件',
                     advanced: '高级控件'
                 },
                 copyTitle: '副本_{0}',

package/es/locale/lang/ja-JP.js

@@ -306,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',
@@ -337,6 +339,7 @@ export default {
                 group: {
                     base: 'Base control',
                     layout: 'Layout control',
+                    system: 'System control',
                     advanced: 'Advanced control'
                 },
                 copyTitle: 'Copy_{0}',

package/es/locale/lang/ko-KR.js

@@ -306,7 +306,9 @@ export default {
             reUpload: '重新上传',
             uploadProgress: '上传中 {0}%',
             uploadErr: '上传失败',
-            uploadSuccess: '上传成功'
+            uploadSuccess: '上传成功',
+            moreBtnText: '更多（{0}）',
+            viewItemTitle: '点击查看'
         },
         formDesign: {
             formName: '表单名称',
@@ -337,6 +339,7 @@ export default {
                 group: {
                     base: '基础控件',
                     layout: '布局控件',
+                    system: '系统控件',
                     advanced: '高级控件'
                 },
                 copyTitle: '副本_{0}',

package/es/locale/lang/pt-BR.js

@@ -306,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',
@@ -337,6 +339,7 @@ export default {
                 group: {
                     base: 'Base control',
                     layout: 'Layout control',
+                    system: 'System control',
                     advanced: 'Advanced control'
                 },
                 copyTitle: 'Copy_{0}',

package/es/locale/lang/ru-RU.js

@@ -306,7 +306,9 @@ export default {
             reUpload: '重新上传',
             uploadProgress: '上传中 {0}%',
             uploadErr: '上传失败',
-            uploadSuccess: '上传成功'
+            uploadSuccess: '上传成功',
+            moreBtnText: '更多（{0}）',
+            viewItemTitle: '点击查看'
         },
         formDesign: {
             formName: '表单名称',
@@ -337,6 +339,7 @@ export default {
                 group: {
                     base: '基础控件',
                     layout: '布局控件',
+                    system: '系统控件',
                     advanced: '高级控件'
                 },
                 copyTitle: '副本_{0}',

package/es/locale/lang/vi-VN.js

@@ -306,7 +306,9 @@ export default {
             reUpload: '重新上传',
             uploadProgress: '上传中 {0}%',
             uploadErr: '上传失败',
-            uploadSuccess: '上传成功'
+            uploadSuccess: '上传成功',
+            moreBtnText: '更多（{0}）',
+            viewItemTitle: '点击查看'
         },
         formDesign: {
             formName: '表单名称',
@@ -337,6 +339,7 @@ export default {
                 group: {
                     base: '基础控件',
                     layout: '布局控件',
+                    system: '系统控件',
                     advanced: '高级控件'
                 },
                 copyTitle: '副本_{0}',

package/es/locale/lang/zh-CN.js

@@ -306,7 +306,9 @@ export default {
             reUpload: '重新上传',
             uploadProgress: '上传中 {0}%',
             uploadErr: '上传失败',
-            uploadSuccess: '上传成功'
+            uploadSuccess: '上传成功',
+            moreBtnText: '更多（{0}）',
+            viewItemTitle: '点击查看'
         },
         formDesign: {
             formName: '表单名称',
@@ -337,6 +339,7 @@ export default {
                 group: {
                     base: '基础控件',
                     layout: '布局控件',
+                    system: '系统控件',
                     advanced: '高级控件'
                 },
                 copyTitle: '副本_{0}',

package/es/locale/lang/zh-TC.js

@@ -304,7 +304,9 @@ export default {
             reUpload: '重新上传',
             uploadProgress: '上传中 {0}%',
             uploadErr: '上传失败',
-            uploadSuccess: '上传成功'
+            uploadSuccess: '上传成功',
+            moreBtnText: '更多（{0}）',
+            viewItemTitle: '點擊查看'
         },
         formDesign: {
             formName: '表單名稱',
@@ -335,6 +337,7 @@ export default {
                 group: {
                     base: '基础控件',
                     layout: '布局控件',
+                    system: '系統控件',
                     advanced: '高级控件'
                 },
                 copyTitle: '副本_{0}',