diff --git a/packages/form-designer/src/GenerateFormItem.vue b/packages/form-designer/src/GenerateFormItem.vue index 0644b1f..6d00e82 100644 --- a/packages/form-designer/src/GenerateFormItem.vue +++ b/packages/form-designer/src/GenerateFormItem.vue @@ -313,6 +313,7 @@ import { } from 'vue-property-decorator'; import TreeSelect from '@riophae/vue-treeselect'; import { DML } from '@/types/common'; +import { isChinese } from '@/utils/utils'; import Tinymce from './components/Tinymce/index.vue'; // 富文本编辑器 import FileUpload from './components/FileUpload/FileUpload.vue'; import GenerateSubForm from './components/SubForm/GenerateSubForm.vue'; @@ -605,7 +606,7 @@ export default class GenerateFormItem extends Vue { const key = group.split(','); const [field, value] = key; // 如果包含中文则默认为直接传参,否则读取相关字段值 - const result = this.isChinese(value) ? (obj[field] = value) : (obj[field] = this.models[value]); + const result = isChinese(value) ? (obj[field] = value) : (obj[field] = this.models[value]); } } } @@ -629,20 +630,13 @@ export default class GenerateFormItem extends Vue { const key = group.split(','); const [field, value] = key; // 如果包含中文则默认为直接传参,否则读取相关字段值 - const result = this.isChinese(value) ? (obj[field] = value) : (obj[field] = this.models[value]); + const result = isChinese(value) ? (obj[field] = value) : (obj[field] = this.models[value]); } } } return obj; } - // 判断是否含有中文 - isChinese(temp) { - const re = /[^\u4e00-\u9fa5]/; - if (re.test(temp)) return false; - return true; - } - diGuiTree(tree) { // 递归便利树结构 tree.forEach((item) => { diff --git a/packages/form-designer/src/components/SubForm/GenerateSubForm.vue b/packages/form-designer/src/components/SubForm/GenerateSubForm.vue index 45e0dfb..9225734 100644 --- a/packages/form-designer/src/components/SubForm/GenerateSubForm.vue +++ b/packages/form-designer/src/components/SubForm/GenerateSubForm.vue @@ -49,6 +49,7 @@ diff --git a/src/utils/utils.ts b/src/utils/utils.ts new file mode 100644 index 0000000..ac38844 --- /dev/null +++ b/src/utils/utils.ts @@ -0,0 +1,13 @@ +/* + * @file: 工具函数 + * @author: BoBo + * @copyright: NanJing Anshare Tech .Com + * @Date: 2021-01-04 23:37:08 + */ +// 判断是否含有中文 +// eslint-disable-next-line import/prefer-default-export +export function isChinese(temp) { + const re = /[^\u4e00-\u9fa5]/; + if (re.test(temp)) return false; + return true; +}