Merge branch 'v4.7.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v4.7.0dev

This commit is contained in:
From-wh 2023-03-04 11:50:27 +08:00
commit fee8006ab7
2 changed files with 27 additions and 26 deletions

View File

@ -46,11 +46,12 @@ class LangTypeServices extends BaseServices
if ($id) $info = $this->dao->get($id);
$field = [];
$field[] = Form::input('language_name', '语言名称', $info['language_name'] ?? '')->required('请填写语言名称');
$field[] = Form::input('file_name', '语言标识', $info['file_name'] ?? '')->required('请填写语言标识')->appendRule('suffix', [
'type' => 'div',
'class' => 'tips-info',
'domProps' => ['innerHTML' => '请选择或输入浏览器标识']
]);
$langCountryList = app()->make(LangCountryServices::class)->selectList([])->toArray();
$options = [];
foreach ($langCountryList as $item) {
$options[] = ['value' => $item['code'], 'label' => $item['name']];
}
$field[] = Form::select('file_name', '语言标识', $info['file_name'] ?? '')->setOptions(Form::setOptions($options));
$field[] = Form::radio('is_default', '是否默认', $info['is_default'] ?? 0)->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]]);
$field[] = Form::radio('status', '状态', $info['status'] ?? 1)->options([['label' => '开启', 'value' => 1], ['label' => '关闭', 'value' => 0]]);
return create_form($id ? '修改语言类型' : '新增语言类型', $field, Url::buildUrl('/setting/lang_type/save/' . $id), 'POST');

View File

@ -95,24 +95,24 @@
@on-cancel="addlangModal = false"
@on-visible-change="modalChange"
>
<Form ref="langFormData" :model="langFormData" :rules="ruleValidate" :label-width="120">
<FormItem label="语言分类:" class="mb20">
<Form ref="langFormData" :model="langFormData" :rules="ruleValidate" >
<FormItem label="应用端:" class="mb20" :label-width="120">
<RadioGroup type="button" v-model="langFormData.is_admin" class="mr15">
<Radio :label="item.value" v-for="(item, index) in langType.isAdmin" :key="index">{{ item.title }}</Radio>
</RadioGroup>
</FormItem>
<Input v-model="langFormData.edit" v-show="false"></Input>
<FormItem label="语言说明:" prop="remarks" class="mb20">
<FormItem label="需要翻译的语句:" prop="remarks" class="mb20">
<Input
v-model="langFormData.remarks"
placeholder="请输入语言说明"
placeholder="请输入需要添加翻译的语句"
style="width: 330px"
search
enter-button="翻译"
@on-search="translate"
></Input>
</FormItem>
<FormItem label="对应语言:" prop="remark" class="mb20">
<FormItem prop="remark" class="mb20">
<Table
ref="langTable"
:loading="traTabLoading"
@ -161,24 +161,24 @@ export default {
width: 80,
},
{
title: '所属语言',
key: 'language_name',
minWidth: 180,
},
{
title: '状态码/文字',
key: 'code',
minWidth: 300,
},
{
title: '备注说明',
title: '原语句',
key: 'remarks',
minWidth: 300,
minWidth: 250,
},
{
title: '对应语言',
title: '对应语言翻译',
key: 'lang_explain',
minWidth: 150,
minWidth: 250,
},
{
title: '状态码/文字(接口/页面调用参考)',
key: 'code',
minWidth: 100,
},
{
title: '语言类型',
key: 'language_name',
minWidth: 100,
},
{
title: '操作',
@ -189,12 +189,12 @@ export default {
],
langColumns: [
{
title: '所属语言',
title: '语言类型',
key: 'language_name',
width: 120,
},
{
title: '对应语言',
title: '对应语言翻译',
slot: 'lang_explain',
minWidth: 250,
},