1、增加条形码图标

2、修改message框大小

src/assets/al-icon/iconfont.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: "iconfont"; /* Project id 3389785 */
-  src: url('iconfont.eot?t=1682478244283'); /* IE9 */
-  src: url('iconfont.eot?t=1682478244283#iefix') format('embedded-opentype'), /* IE6-IE8 */
-       url('iconfont.woff2?t=1682478244283') format('woff2'),
-       url('iconfont.woff?t=1682478244283') format('woff'),
-       url('iconfont.ttf?t=1682478244283') format('truetype'),
-       url('iconfont.svg?t=1682478244283#iconfont') format('svg');
+  src: url('iconfont.eot?t=1683179152831'); /* IE9 */
+  src: url('iconfont.eot?t=1683179152831#iefix') format('embedded-opentype'), /* IE6-IE8 */
+       url('iconfont.woff2?t=1683179152831') format('woff2'),
+       url('iconfont.woff?t=1683179152831') format('woff'),
+       url('iconfont.ttf?t=1683179152831') format('truetype'),
+       url('iconfont.svg?t=1683179152831#iconfont') format('svg');
 }
 
 .iconfont {
@@ -16,6 +16,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-tiaoxingma:before {
+  content: "\e626";
+}
+
 .icon-max1:before {
   content: "\e6e3";
 }

src/assets/al-icon/iconfont.json

@@ -6,6 +6,13 @@
   "description": "",
   "glyphs": [
     {
+      "icon_id": "2736409",
+      "name": "条形码",
+      "font_class": "tiaoxingma",
+      "unicode": "e626",
+      "unicode_decimal": 58918
+    },
+    {
       "icon_id": "32474959",
       "name": "全屏最大化",
       "font_class": "max1",

src/assets/al-icon/iconfont.svg

@@ -14,6 +14,8 @@
     />
       <missing-glyph />
       
+      <glyph glyph-name="tiaoxingma" unicode="&#58918;" d="M910.613 695.812H1024V72.19000000000005H910.613zM540.613 695.812H654V72.19000000000005H540.613zM0 695.812h56.693V72.19000000000005H0zM84.173 695.812h28.347V72.19000000000005H84.173zM144.173 695.812h28.347V72.19000000000005h-28.347zM206.173 695.812h28.347V72.19000000000005h-28.347zM361.653 695.812H390V72.19000000000005h-28.347zM421.653 695.812H450V72.19000000000005h-28.347zM483.653 695.812H512V72.19000000000005h-28.347zM691.653 695.812H720V72.19000000000005h-28.347zM753.653 695.812H782V72.19000000000005h-28.347zM262 695.812h56.693V72.19000000000005H262zM814 695.812h56.693V72.19000000000005H814z"  horiz-adv-x="1024" />
+      
       <glyph glyph-name="max1" unicode="&#59107;" d="M910.827 763v-184c0-11.046-8.954-20-20-20s-20 8.954-20 20V714.716L641.142 485.031c-7.81-7.81-20.474-7.81-28.284 0-7.81 7.81-7.81 20.474 0 28.284l229.686 229.687-135.717-0.002c-11.046 0-20 8.954-20 20s8.954 20 20 20h184c11.046 0 20-8.954 20-20zM113 763v-184c0-11.046 8.954-20 20-20s20 8.954 20 20V714.716l229.685-229.685c7.81-7.81 20.474-7.81 28.284 0 7.81 7.81 7.81 20.474 0 28.284L181.283 743.002 317 743c11.046 0 20 8.954 20 20s-8.954 20-20 20H133c-11.046 0-20-8.954-20-20z m797.827-758.827v184c0 11.046-8.954 20-20 20s-20-8.954-20-20v-135.716L641.142 282.14200000000005c-7.81 7.81-20.474 7.81-28.284 0-7.81-7.81-7.81-20.474 0-28.284L842.544 24.16999999999996l-135.717 0.002c-11.046 0-20-8.954-20-20s8.954-20 20-20h184c11.046 0 20 8.954 20 20z m-797.827 0v184c0 11.046 8.954 20 20 20s20-8.954 20-20v-135.716l229.685 229.685c7.81 7.81 20.474 7.81 28.284 0 7.81-7.81 7.81-20.474 0-28.284L181.283 24.16999999999996 317 24.173000000000002c11.046 0 20-8.954 20-20s-8.954-20-20-20H133c-11.046 0-20 8.954-20 20z"  horiz-adv-x="1024" />
       
       <glyph glyph-name="min" unicode="&#59108;" d="M607 499.173v184c0 11.046 8.954 20 20 20s20-8.954 20-20v-135.716l229.685 229.685c7.81 7.81 20.474 7.81 28.284 0 7.81-7.81 7.81-20.474 0-28.284L675.283 519.1700000000001 811 519.173c11.046 0 20-8.954 20-20s-8.954-20-20-20H627c-11.046 0-20 8.954-20 20z m-190.173 0v184c0 11.046-8.954 20-20 20s-20-8.954-20-20v-135.716L147.142 777.142c-7.81 7.81-20.474 7.81-28.284 0-7.81-7.81-7.81-20.474 0-28.284L348.544 519.1700000000001l-135.717 0.002c-11.046 0-20-8.954-20-20s8.954-20 20-20h184c11.046 0 20 8.954 20 20zM607 268v-184c0-11.046 8.954-20 20-20s20 8.954 20 20V219.716l229.685-229.685c7.81-7.81 20.474-7.81 28.284 0 7.81 7.81 7.81 20.474 0 28.284L675.283 248.00199999999995 811 248c11.046 0 20 8.954 20 20s-8.954 20-20 20H627c-11.046 0-20-8.954-20-20z m-190.173 0v-184c0-11.046-8.954-20-20-20s-20 8.954-20 20V219.716L147.142-9.969000000000051c-7.81-7.81-20.474-7.81-28.284 0-7.81 7.81-7.81 20.474 0 28.284l229.686 229.687-135.717-0.002c-11.046 0-20 8.954-20 20s8.954 20 20 20h184c11.046 0 20-8.954 20-20z"  horiz-adv-x="1024" />

src/components/base/dk-message/index.vue

@@ -1,6 +1,6 @@
 <!-- @desc:Message信息  @auth:周兴  @time:2022/11/15 14:31 -->
 <template>
-  <DkModal ref="modal_message" v-model="visible" width="390" :title="title"
+  <DkModal ref="modal_message" v-model="visible" width="300" :title="title"
            @modalOk="onOk"
            @modalCancel="onCancel"
            @on-cancel="onCancel">
@@ -30,7 +30,7 @@ export default {
       okFunc: () => {
       },//确定回调
       okText: vm.$t('confirm'),
-      cancelText: vm.$t('close'),
+      cancelText: vm.$t('cancel'),
     }
   },
   methods: {
@@ -137,7 +137,7 @@ export default {
 }
 
 .content-div {
-  height: 180px;
+  height: 130px;
   align-items: center;
   justify-content: center;
   display: flex;

src/components/base/dk-modal/dk-modal.vue

@@ -44,7 +44,7 @@
         <DkButton :loading="loading" v-if="okVisibleFlag" type="primary" @click="modalOk" name="confirm"
                   :ref="saveFlag?'save':'confirm'">{{ saveFlag ? '保存(S)' : '确定(O)' }}
         </DkButton>
-        <DkButton v-if="cancelVisibleFlag" @click="modalCancel" name="close" ref="close">{{ '关闭(X)' }}</DkButton>
+        <DkButton v-if="cancelVisibleFlag" @click="modalCancel" name="close" ref="close">{{ saveFlag ? '关闭(X)' : '取消(T)' }}</DkButton>
       </div>
     </Modal>
   </div>

src/components/base/dk-table/dk-table-column.vue

@@ -389,6 +389,11 @@ export default {
     seqTipContent:{
       type:String,
       default:null
+    },
+    // 是否居中
+    centerFlag:{
+      type:Boolean,
+      default:null
     }
   },
   data() {

src/components/base/dk-table/dk-table.vue

@@ -871,6 +871,10 @@ export default {
       for (let it of this.$slots.default) {
         if (it && it.componentInstance) {
           if (it.componentInstance.field === column.property) {
+            // 直接设置为居中
+            if(it.componentInstance.centerFlag != null && it.componentInstance.centerFlag){
+              return {textAlign: "center"}
+            }
             if (it.componentInstance.columnType === 'number') {
               return {textAlign: 'right'}
             } else if (it.componentInstance.columnType === 'checkbox' || it.componentInstance.columnType === 'date') {

src/locale/lang/zh-CN.js

@@ -352,6 +352,7 @@ export const columns = {
   className: '分类名称',
   classCode: '模块',
   settingName: '参数名称',
+  settingStyle:'参数分类',
   settingValue: '参数值',
   settingDefault: '默认值',
   settingDescription: '参数说明',

src/view/core/system-setting/index.vue

@@ -18,11 +18,11 @@
     <card ref="tableCard">
       <div style="display: flex;width: 100%;height: 100%">
         <!-- 列表部分左侧   -->
-        <div style="width: 260px;">
+        <div style="width: 200px;">
           <DkTable
             ref="leftTable"
             :data="searchInfo"
-            :height="tableHeight-20"
+            :height="tableHeight-30"
             :page-flag="false"
             :page-total-flag="false"
             :show-setting-flag="false"
@@ -30,23 +30,23 @@
             :choose-flag="false"
             @current-change="currentChangeEvent($event)">
             <DkTableColumn :title="$t('className')" field="className"
-                           width="auto" :filter=false></DkTableColumn>
+                           width="auto" :filter=false :center-flag="true"></DkTableColumn>
           </DkTable>
         </div>
 
         <!-- 列表部分右侧   -->
-        <div style="margin-left: 5px;width:calc( 100% - 260px )">
+        <div style="margin-left: 5px;width:calc( 100% - 200px )">
           <DkTable
             ref="rightTable"
             :data="tableRightData"
-            :height="tableHeight-20"
+            :height="tableHeight-30"
             :page-flag="false"
             :page-total-flag="false"
             :show-setting-flag="false"
             :freeze="false"
             :choose-flag="false">
-            <DkTableColumn field="classCode"></DkTableColumn>
-            <DkTableColumn field="settingName" width="280"></DkTableColumn>
+            <DkTableColumn field="classCode" :title="$t('settingStyle')"  width="100"></DkTableColumn>
+            <DkTableColumn field="settingName" width="220"></DkTableColumn>
             <vxe-column show-overflow="ellipsis" field="settingValue" width="100" height="100" min-width="80" class-name="setting-value-class"
                         :title="$t('settingValue')"
             >
@@ -80,24 +80,24 @@
               </template>
 
             </vxe-column>
-            <vxe-column show-overflow="ellipsis" field="settingDefault" width="100" height="100" min-width="80"
-                        :title="$t('settingDefault')"
-            >
-              <template #default="{ row }">
-                <!--数字类型-->
-                <vxe-input v-if="row.valueKind == 'INT' || row.valueKind == 'NUM'" size="mini" :disabled=true
-                           v-model="row.settingDefault"></vxe-input>
-                <!--文本类型-->
-                <vxe-input v-if="row.valueKind == 'STR'" :disabled=true
-                           size="mini" v-model="row.settingDefault"></vxe-input>
-                <!--下拉框类型-->
-                <vxe-input v-if="row.valueKind == 'S-CHOICE'" :disabled=true
-                           size="mini" v-model="row.settingDefault"></vxe-input>
-                <!--布尔类型-->
-                <i-switch size="small" :disabled=true v-if="row.valueKind == 'BOOL'"
-                          v-model="row.settingDefault"></i-switch>
-              </template>
-            </vxe-column>
+<!--            <vxe-column show-overflow="ellipsis" field="settingDefault" width="100" height="100" min-width="80"-->
+<!--                        :title="$t('settingDefault')"-->
+<!--            >-->
+<!--              <template #default="{ row }">-->
+<!--                &lt;!&ndash;数字类型&ndash;&gt;-->
+<!--                <vxe-input v-if="row.valueKind == 'INT' || row.valueKind == 'NUM'" size="mini" :disabled=true-->
+<!--                           v-model="row.settingDefault"></vxe-input>-->
+<!--                &lt;!&ndash;文本类型&ndash;&gt;-->
+<!--                <vxe-input v-if="row.valueKind == 'STR'" :disabled=true-->
+<!--                           size="mini" v-model="row.settingDefault"></vxe-input>-->
+<!--                &lt;!&ndash;下拉框类型&ndash;&gt;-->
+<!--                <vxe-input v-if="row.valueKind == 'S-CHOICE'" :disabled=true-->
+<!--                           size="mini" v-model="row.settingDefault"></vxe-input>-->
+<!--                &lt;!&ndash;布尔类型&ndash;&gt;-->
+<!--                <i-switch size="small" :disabled=true v-if="row.valueKind == 'BOOL'"-->
+<!--                          v-model="row.settingDefault"></i-switch>-->
+<!--              </template>-->
+<!--            </vxe-column>-->
             <DkTableColumn field="settingDescription" width="auto"></DkTableColumn>
           </DkTable>
         </div>
@@ -428,6 +428,14 @@ export default {
 /deep/.setting-value-class .vxe-cell{
   padding-left: 0 !important;
   padding-right: 0 !important;
+  display: flex !important;
+  align-items: center !important;
+  justify-content: center;
+}
+
+/deep/.vxe-input--inner{
+  text-align: center !important;
+  padding: 0 !important;
 }
 
 /deep/ .vxe-cell {