n20-common-lib 3.2.39 → 3.2.40

package/src/components/ProFilterView/advancedQuery.vue

@@ -30,23 +30,19 @@
               class="logic-option"
               :class="{ active: group.conditionLogic === 'and' }"
               @click="group.conditionLogic = 'and'"
-            >
-              且
-            </div>
+            >{{ $lc('且') }}</div>
             <div
               class="logic-option"
               :class="{ active: group.conditionLogic === 'or' }"
               @click="group.conditionLogic = 'or'"
-            >
-              或
-            </div>
+            >{{ $lc('或') }}</div>
           </div>
         </div>
         <div>
           <div v-for="(condition, condIndex) in group.conditions" :key="condIndex" class="condition-item">
             <div class="condition-row">
               <!-- 字段选择 -->
-              <el-select v-model="condition.field" class="field-select" placeholder="请选择字段" size="small">
+              <el-select v-model="condition.field" class="field-select" :placeholder="$lc('请选择字段')" size="small">
                 <el-option
                   v-for="field in canSetFilter"
                   :key="field.value"
@@ -56,7 +52,7 @@
                 />
               </el-select>
               <!-- 操作符选择 -->
-              <el-select v-model="condition.operator" class="operator-select" placeholder="请选择操作符" size="small">
+              <el-select v-model="condition.operator" class="operator-select" :placeholder="$lc('请选择操作符')" size="small">
                 <el-option
                   v-for="opt in (dz[condition.advancedQueryType] && dz[condition.advancedQueryType].types) || []"
                   :key="opt.id"
@@ -82,7 +78,7 @@
                   v-else-if="condition.valueType === 'select' || condition.valueType === 'selectMultiple'"
                   v-model="condition.value"
                   class="input-w"
-                  placeholder="请选择"
+                  :placeholder="$lc('请选择')"
                   size="small"
                   :multiple="condition.valueType === 'selectMultiple'"
                   collapse-tags
@@ -97,7 +93,7 @@
                   v-model="condition.value"
                   type="date"
                   value-format="yyyy-MM-dd"
-                  placeholder="请选择日期"
+                  :placeholder="$lc('请选择日期')"
                 />
 
                 <!-- 日期范围选择器 -->
@@ -115,7 +111,7 @@
                   v-model="condition.value"
                   :is-clearable="true"
                   :d-num="6"
-                  placeholder="请输入"
+                  :placeholder="$lc('请输入')"
                 />
 
                 <!-- 金额范围 -->
@@ -130,7 +126,7 @@
                 <el-input
                   v-else-if="condition.valueType === 'input'"
                   v-model="condition.value"
-                  placeholder="请输入"
+                  :placeholder="$lc('请输入')"
                   size="small"
                   clearable
                 />
@@ -142,7 +138,7 @@
                     )
                   "
                   v-model="condition.value"
-                  placeholder="请输入"
+                  :placeholder="$lc('请输入')"
                   size="small"
                   clearable
                   disabled
@@ -152,7 +148,7 @@
                   v-else-if="condition.valueType === 'findSearch'"
                   v-model="condition.value"
                   class="input-w"
-                  placeholder="请输入"
+                  :placeholder="$lc('请输入')"
                   clearable
                   @change="searchFn"
                 />
@@ -176,11 +172,9 @@
     <!-- 添加条件按钮 -->
     <div class="group-actions">
       <el-button v-if="value.length > 0" type="text" class="add-condition-btn" @click.stop="addCondition(0)">
-        <i class="v3-icon-add-fill"></i> 添加条件
-      </el-button>
+        <i class="v3-icon-add-fill"></i>{{ $lc('添加条件') }}</el-button>
       <el-button type="text" class="add-group-btn" @click.stop="addConditionGroup()">
-        <i class="v3-icon-add-fill"></i> 添加条件组
-      </el-button>
+        <i class="v3-icon-add-fill"></i>{{ $lc('添加条件组') }}</el-button>
     </div>
   </div>
 </template>
@@ -225,11 +219,11 @@ export default {
       canSetFilter: [],
       // 字段配置
       fieldOptions: [
-        { label: '分派账户所属机构', value: 'accountOrg', type: 'select', options: ['机构1', '机构2', '机构3'] },
-        { label: '状态', value: 'status', type: 'select', options: ['未开始', '进行中', '已完成', '异常'] },
-        { label: '金额', value: 'amount', type: 'number' },
-        { label: '创建时间', value: 'createTime', type: 'date' },
-        { label: '更新时间', value: 'updateTime', type: 'daterange' }
+        { label: $lc("分派账户所属机构"), value: 'accountOrg', type: 'select', options: [$lc("机构1"), $lc("机构2"), $lc("机构3")] },
+        { label: $lc("状态"), value: 'status', type: 'select', options: [$lc("未开始"), $lc("进行中"), $lc("已完成"), $lc("异常")] },
+        { label: $lc("金额"), value: 'amount', type: 'number' },
+        { label: $lc("创建时间"), value: 'createTime', type: 'date' },
+        { label: $lc("更新时间"), value: 'updateTime', type: 'daterange' }
       ],
       // 字段对照
       // 控制器
@@ -244,205 +238,205 @@ export default {
       // 禁用 inputDisabled
       dz: {
         1: {
-          name: '文本型',
+          name: $lc("文本型"),
           code: 1,
           types: [
             {
-              name: '包含',
+              name: $lc("包含"),
               value: 1,
               type: 'input'
             },
             {
-              name: '不包含',
+              name: $lc("不包含"),
               value: 2,
               type: 'input'
             },
             {
-              name: '等于',
+              name: $lc("等于"),
               value: 3,
               type: 'input'
             },
             {
-              name: '不等于',
+              name: $lc("不等于"),
               value: 4,
               type: 'input'
             },
             {
-              name: '为空',
+              name: $lc("为空"),
               value: 5,
               type: 'inputDisabled'
             },
             {
-              name: '不为空',
+              name: $lc("不为空"),
               value: 6,
               type: 'inputDisabled'
             }
           ]
         },
         2: {
-          name: '数值型',
+          name: $lc("数值型"),
           code: 2,
           types: [
             {
-              name: '等于',
+              name: $lc("等于"),
               value: 7,
               type: 'inputNumber'
             },
             {
-              name: '不等于',
+              name: $lc("不等于"),
               value: 8,
               type: 'inputNumber'
             },
             {
-              name: '大于',
+              name: $lc("大于"),
               value: 9,
               type: 'inputNumber'
             },
             {
-              name: '小于',
+              name: $lc("小于"),
               value: 10,
               type: 'inputNumber'
             },
             {
-              name: '大于等于',
+              name: $lc("大于等于"),
               value: 11,
               type: 'inputNumber'
             },
             {
-              name: '小于等于',
+              name: $lc("小于等于"),
               value: 12,
               type: 'inputNumber'
             },
             {
-              name: '区间',
+              name: $lc("区间"),
               value: 13,
               type: 'inputNumberRange'
             },
             {
-              name: '为空',
+              name: $lc("为空"),
               value: 5,
               type: 'inputNumberDisabled'
             },
             {
-              name: '不为空',
+              name: $lc("不为空"),
               value: 6,
               type: 'inputNumberDisabled'
             }
           ]
         },
         3: {
-          name: '日期/时间型',
+          name: $lc("日期/时间型"),
           code: 3,
           types: [
             {
-              name: '等于',
+              name: $lc("等于"),
               value: 3,
               type: 'datePicker'
             },
             {
-              name: '介于',
+              name: $lc("介于"),
               value: 14,
               type: 'dateRangePicker'
             },
             {
-              name: '早于',
+              name: $lc("早于"),
               value: 15,
               type: 'datePicker'
             },
             {
-              name: '晚于',
+              name: $lc("晚于"),
               value: 16,
               type: 'datePicker'
             },
             {
-              name: '为空',
+              name: $lc("为空"),
               value: 5,
               type: 'datePickerDisabled'
             },
             {
-              name: '不为空',
+              name: $lc("不为空"),
               value: 6,
               type: 'datePickerDisabled'
             }
           ]
         },
         4: {
-          name: '单选枚举型',
+          name: $lc("单选枚举型"),
           code: 4,
           types: [
             {
-              name: '等于',
+              name: $lc("等于"),
               value: 3,
               type: 'select'
             },
             {
-              name: '不等于',
+              name: $lc("不等于"),
               value: 4,
               type: 'select'
             },
             {
-              name: '属于',
+              name: $lc("属于"),
               value: 17,
               type: 'selectMultiple'
             },
             {
-              name: '不属于',
+              name: $lc("不属于"),
               value: 18,
               type: 'selectMultiple'
             },
             {
-              name: '为空',
+              name: $lc("为空"),
               value: 5,
               type: 'selectDisabled'
             },
             {
-              name: '不为空',
+              name: $lc("不为空"),
               value: 6,
               type: 'selectDisabled'
             }
           ]
         },
         5: {
-          name: '人员/部门型',
+          name: $lc("人员/部门型"),
           code: 5,
           types: [
             {
-              name: '包含',
+              name: $lc("包含"),
               value: 1,
               type: 'input'
             },
             {
-              name: '不包含',
+              name: $lc("不包含"),
               value: 2,
               type: 'input'
             },
             {
-              name: '属于',
+              name: $lc("属于"),
               value: 17,
               type: 'findSearchMultiple'
             },
             {
-              name: '不属于',
+              name: $lc("不属于"),
               value: 18,
               type: 'findSearchMultiple'
             },
             {
-              name: '等于',
+              name: $lc("等于"),
               value: 3,
               type: 'findSearch'
             },
             {
-              name: '不等于',
+              name: $lc("不等于"),
               value: 4,
               type: 'findSearch'
             },
             {
-              name: '为空',
+              name: $lc("为空"),
               value: 5,
               type: 'inputDisabled'
             },
             {
-              name: '不为空',
+              name: $lc("不为空"),
               value: 6,
               type: 'inputDisabled'
             }

package/src/components/ProFilterView/index.vue

@@ -11,7 +11,7 @@
           trigger="click"
           class="m-r-s"
         >
-          <el-button slot="reference" class="botton" :class="{ activiti: selectedItem !== '无视图' }">
+          <el-button slot="reference" class="botton" :class="{ activiti: selectedItem !== $lc('无视图') }">
             <div class="flex-box flex-v m-r">
               <i class="v3-icon-inbox"></i>
               <div class="popover-title" style="margin: 0 8px" :title="selectedItem">{{ selectedItem }}</div>
@@ -19,7 +19,7 @@
             </div>
           </el-button>
           <div class="p-s">
-            <cl-input-search v-model="searchKeyword" class="w-100p" placeholder="请输入关键字" />
+            <cl-input-search v-model="searchKeyword" class="w-100p" :placeholder="$lc('请输入关键字')" />
             <div style="color: var(--color-text-secondary); margin: 12px 0 8px 0">{{ $lc('自定义视图') }}</div>
             <div class="filter-view-wrapper">
               <cl-drag-list class="flex-item" :list="filteredList" :hide-delete="true" @change="handleDragSort">
@@ -30,7 +30,7 @@
                     }}</span>
                     <i v-if="selectedItem === item.viewName" class="el-icon-check selected-icon"></i>
                     <el-dropdown
-                      v-if="selectedItem !== item.viewName && item.viewName !== '无视图'"
+                      v-if="selectedItem !== item.viewName && item.viewName !== $lc('无视图')"
                       trigger="click"
                       class="proFilterView-list-item__more"
                       @command="(command) => handleCommand(command, item)"
@@ -136,7 +136,7 @@
         <el-form-item
           :label="$lc('视图名称')"
           prop="viewName"
-          :rules="[{ required: true, message: '请输入', trigger: 'blur' }]"
+          :rules="[{ required: true, message: $lc('请输入'), trigger: 'blur' }]"
         >
           <el-input v-model="form.viewName" maxlength="30" show-word-limit />
         </el-form-item>
@@ -286,8 +286,8 @@ export default {
     return {
       VIEW_TYPE,
       searchKeyword: '',
-      list: ['无视图'],
-      selectedItem: '无视图', // 默认选中第一项
+      list: [$lc('无视图')],
+      selectedItem: $lc('无视图'), // 默认选中第一项
       viewPopoverVisible: false,
       visible: false,
       isAdd: false,
@@ -514,10 +514,10 @@ export default {
           item.type === 'daterange'
             ? [item.startDate, item.endDate]
             : item.type === 'numberrange'
-              ? [item.startValue, item.endValue]
-              : item.slotFields?.length
-                ? item.slotFields
-                : [item.value]
+            ? [item.startValue, item.endValue]
+            : item.slotFields?.length
+            ? item.slotFields
+            : [item.value]
 
         keys.forEach((k) => allFilterKeys.add(k))
         if (item.required) {
@@ -568,7 +568,7 @@ export default {
           })
           this.list = [
             {
-              viewName: '无视图'
+              viewName: $lc('无视图')
             },
             ...list
           ]
@@ -583,7 +583,7 @@ export default {
         .catch((err) => {
           this.list = [
             {
-              viewName: '无视图'
+              viewName: $lc('无视图')
             }
           ]
         })
@@ -689,26 +689,26 @@ export default {
     // 保存视图
     saveSt() {
       if (!this.bussId) {
-        this.$message.warning('缺少业务ID，无法保存视图')
+        this.$message.warning($lc('缺少业务ID，无法保存视图'))
         return
       }
 
       this.$refs.form.validate(async (valid) => {
         if (!valid) {
-          this.$message.error('请输入视图名称')
+          this.$message.error($lc('请输入视图名称'))
           return
         }
         if (this.form.viewType === VIEW_TYPE.BASIC) {
           this.syncDialogFilterKeyIds()
         }
         if (this.form.viewType === VIEW_TYPE.BASIC && !this.form.keyIds.length) {
-          this.$message.warning('至少添加一个条件')
+          this.$message.warning($lc('至少添加一个条件'))
           return
         }
         if (this.form.viewType === VIEW_TYPE.ADVANCED) {
           const hasEmptyValue = this.hasEmptyCondition()
           if (!this.conditionGroups.length || hasEmptyValue) {
-            this.$message.warning('至少添加一个条件')
+            this.$message.warning($lc('至少添加一个条件'))
             return
           }
         }
@@ -719,7 +719,7 @@ export default {
             return false
           }
           this.visible = false
-          this.$message.success('保存成功')
+          this.$message.success($lc('保存成功'))
           this.getFilterList(this.viewId)
         })
       })
@@ -727,15 +727,15 @@ export default {
     // 删除
     deleteOne(row) {
       this.$msgboxPor({
-        title: '确认要删除吗？',
-        message: '内容从页面删除，将不可恢复',
+        title: $lc('确认要删除吗？'),
+        message: $lc('内容从页面删除，将不可恢复'),
         type: 'error',
-        confirmButtonText: '确定',
-        cancelButtonText: '取消'
+        confirmButtonText: $lc('确定'),
+        cancelButtonText: $lc('取消')
       }).then(async () => {
         const { code } = await axios.post('/bems/query/viewColumn/deleteViewInfo', { viewId: row.viewId })
         if (code !== 200) return
-        this.$message.success('删除成功')
+        this.$message.success($lc('删除成功'))
         this.getFilterList()
       })
     },
@@ -744,7 +744,7 @@ export default {
       this.viewPopoverVisible = false
       this.selectItem = item
       this.selectedItem = item.viewName
-      if (item.viewName === '无视图') {
+      if (item.viewName === $lc('无视图')) {
         this.selectItem = ''
         this.searchValue = { ...this.getInitialSearchValue, ...this.initialValue }
         this.conditionGroups = []
@@ -761,7 +761,7 @@ export default {
     },
     // 拖动保存视图列表
     handleDragSort(list) {
-      console.log('当前list:', list)
+      console.log($lc('当前list:'), list)
     },
     /**
      * 查询类型切换（基础查询 <-> 高级查询）
@@ -799,7 +799,7 @@ export default {
      */
     resetState() {
       this.searchKeyword = ''
-      this.selectedItem = '无视图'
+      this.selectedItem = $lc('无视图')
       this.selectItem = ''
       this.searchValue = { ...this.getInitialSearchValue, ...this.initialValue }
       this.searchForm = { ...this.getInitialSearchValue }
@@ -814,7 +814,7 @@ export default {
 
 <style scoped>
 .filter.is-hidden {
-  padding:0 !important;
+  padding: 0 !important;
   border-bottom: none !important;
 }
 </style>

package/src/components/SelectDatePickerPro/busiDate.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="flex-box flex-v">
     <div class="n20-date-select-busi">
-      <el-select v-model="type" placeholder="请选择" style="width: 85px" @change="handleDate">
+      <el-select v-model="type" :placeholder="$lc('请选择')" style="width: 85px" @change="handleDate">
         <el-option v-for="(item, index) in selectOptions" :key="index" :label="item.label" :value="item.value" />
       </el-select>
       <el-date-picker
@@ -9,7 +9,7 @@
         format="yyyy-MM-dd"
         value-format="yyyy-MM-dd"
         type="date"
-        :placeholder="'选择日' | $lc"
+        :placeholder="$lc('选择日') | $lc"
         @change="changeDate"
       />
     </div>
@@ -62,9 +62,9 @@ export default {
       type: Array,
       default: () => {
         return [
-          { label: '期望日', value: 1 },
-          { label: '提交日', value: 2 },
-          { label: '发起日', value: 3 }
+          { label: $lc("期望日"), value: 1 },
+          { label: $lc("提交日"), value: 2 },
+          { label: $lc("发起日"), value: 3 }
         ]
       }
     }

package/src/components/SelectDatePickerPro/halfYearPicker.vue

@@ -103,7 +103,7 @@ export default {
           const [, year, startMonth] = startDateMatch
           this.year = year
           this.halfYear = startMonth === '01' ? 1 : 2
-          this.showValue = `${year} 年 ${startMonth === '01' ? '上半年' : '下半年'}`
+          this.showValue = `${year} 年 ${startMonth === '01' ? $lc("上半年") : $lc("下半年")}`
         } else {
           this.showValue = ''
         }
@@ -132,7 +132,7 @@ export default {
       this.halfYear = i + 1
       let arr = [`${this.year}-${i === 0 ? '01' : '07'}`, `${this.year}-${i === 0 ? '06' : '12'}`]
       this.showHalfYear = false
-      this.showValue = `${this.year} 年 ${i === 0 ? '上半年' : '下半年'}`
+      this.showValue = `${this.year} 年 ${i === 0 ? $lc("上半年") : $lc("下半年")}`
       // 6月最后一天是30 12月最后一天是31
       this.$emit('input', { startDate: arr[0] + '-01', endDate: i === 0 ? arr[1] + '-30' : arr[1] + '-31' })
       this.$emit('change', { startDate: arr[0] + '-01', endDate: i === 0 ? arr[1] + '-30' : arr[1] + '-31' })