ad7b5b62 by lihua

fix

1 parent b55e7c13
...@@ -446,3 +446,9 @@ export const getApiInvokeCount = (data) => request({ ...@@ -446,3 +446,9 @@ export const getApiInvokeCount = (data) => request({
446 // method: 'get', 446 // method: 'get',
447 // params 447 // params
448 // }) 448 // })
449
450 export const chTransformEn =(params)=> request({
451 url: `${import.meta.env.VITE_APP_COMMON_URL}/common/convert-field-ch-name`,
452 method: "post",
453 data: params,
454 });
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -5,7 +5,8 @@ ...@@ -5,7 +5,8 @@
5 <script lang="ts" setup name="importTableField"> 5 <script lang="ts" setup name="importTableField">
6 import { ref } from 'vue'; 6 import { ref } from 'vue';
7 import { 7 import {
8 getParamsList 8 getParamsList,
9 chTransformEn
9 } from "@/api/modules/dataAsset"; 10 } from "@/api/modules/dataAsset";
10 import { pinyin } from 'pinyin-pro'; 11 import { pinyin } from 'pinyin-pro';
11 import useUserStore from "@/store/modules/user"; 12 import useUserStore from "@/store/modules/user";
...@@ -140,24 +141,41 @@ const changeStep = (val) => { ...@@ -140,24 +141,41 @@ const changeStep = (val) => {
140 getParamsListData(); 141 getParamsListData();
141 } 142 }
142 if (!tableCreateInfo.value.damCatalogTableField.length) { 143 if (!tableCreateInfo.value.damCatalogTableField.length) {
143 tableCreateInfo.value.damCatalogTableField = fileTableFields.value.map(field => { 144 let list: any = [];
144 let enName = pinyin(field.chName, { 145 fileTableFields.value.forEach(field => {
145 pattern: 'first', 146 list.push(field.chName)
146 separator: '', 147 })
147 toneType: 'none' 148 chTransformEn(list).then(res => {
148 }); 149 tableCreateInfo.value.damCatalogTableField = res.data.map(field => {
149 let index = enName.indexOf("(") || enName.indexOf("(") || enName.indexOf('[') || enName.indexOf('【') || enName.indexOf(':') || enName.indexOf(':'); 150 return {
150 if (index > -1) { 151 chName: field.chName,
151 enName = enName.substring(0, index); 152 enName: field.enName,
152 } 153 isPrimary: 'N',
153 return { 154 notNull: 'N',
154 chName: field.chName, 155 isEdit: true,
155 enName: enName, 156 dataType: field.dataType,
156 isPrimary: 'N', 157 fieldLength: field.fieldLength,
157 notNull: field.notNull || 'N', 158 }
158 isEdit: true 159 })
159 } 160 })
160 }); 161 // tableCreateInfo.value.damCatalogTableField = fileTableFields.value.map(field => {
162 // let enName = pinyin(field.chName, {
163 // pattern: 'first',
164 // separator: '',
165 // toneType: 'none'
166 // });
167 // let index = enName.indexOf("(") || enName.indexOf("(") || enName.indexOf('[') || enName.indexOf('【') || enName.indexOf(':') || enName.indexOf(':');
168 // if (index > -1) {
169 // enName = enName.substring(0, index);
170 // }
171 // return {
172 // chName: field.chName,
173 // enName: enName,
174 // isPrimary: 'N',
175 // notNull: field.notNull || 'N',
176 // isEdit: true
177 // }
178 // });
161 } 179 }
162 step.value = val; 180 step.value = val;
163 } 181 }
......
...@@ -699,6 +699,9 @@ const getTreeData = (needClick = false, currData = {}) => { ...@@ -699,6 +699,9 @@ const getTreeData = (needClick = false, currData = {}) => {
699 }); 699 });
700 } 700 }
701 getFirstPageData() 701 getFirstPageData()
702 } else {//处理数据被删除完成,表格没刷新的情况。
703 tableInfo.value.data = [];
704 tableInfo.value.page.rows = 0;
702 } 705 }
703 } else { 706 } else {
704 ElMessage({ 707 ElMessage({
......
Styling with Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!