Browse Source

数据模板默认基础样式调整

cfort 2 năm trước cách đây
mục cha
commit
85d3cd2040

+ 13 - 5
src/business/platform/data/constants/buttons.js

@@ -41,10 +41,18 @@ const buttons = {
         scope: ['manage'],
         scope: ['manage'],
         contextmenu: 'sub'
         contextmenu: 'sub'
     },
     },
+    // 原明细
+    // 'detail': {
+    //     label: '明细',
+    //     type: 'info',
+    //     icon: 'ibps-icon-detail',
+    //     scope: ['manage'],
+    //     contextmenu: 'sub'
+    // },
     'detail': {
     'detail': {
-        label: '明细',
-        type: 'info',
-        icon: 'ibps-icon-detail',
+        label: '查阅',
+        type: 'primary',
+        icon: 'ibps-icon-eye',
         scope: ['manage'],
         scope: ['manage'],
         contextmenu: 'sub'
         contextmenu: 'sub'
     },
     },
@@ -92,9 +100,9 @@ const buttons = {
         contextmenu: 'all'
         contextmenu: 'all'
     },
     },
     'consult': {
     'consult': {
-        label: '查阅',
+        label: '表单',
         type: 'primary',
         type: 'primary',
-        icon: 'ibps-icon-eye',
+        icon: 'ibps-icon-table',
         scope: ['manage'],
         scope: ['manage'],
         contextmenu: 'sub'
         contextmenu: 'sub'
     },
     },

+ 4 - 4
src/components/ibps-toolbar/index.vue

@@ -32,7 +32,7 @@
           :disabled="handleActionDisabled(button.disabled)"
           :disabled="handleActionDisabled(button.disabled)"
           @click="emitEventHandler('action-event',button,position,data,index)"
           @click="emitEventHandler('action-event',button,position,data,index)"
         >
         >
-          {{ button.label }}
+        {{ ` ${button.label}` }}
         </el-link>
         </el-link>
         <el-divider v-if="(actions.length == 2 && index == 0) || (actions.length == 3 && index != 2)" :key="index" direction="vertical" />
         <el-divider v-if="(actions.length == 2 && index == 0) || (actions.length == 3 && index != 2)" :key="index" direction="vertical" />
       </template>
       </template>
@@ -46,7 +46,7 @@
               :disabled="handleActionDisabled(button.disabled)"
               :disabled="handleActionDisabled(button.disabled)"
               @click="emitEventHandler('action-event',button,position,data,index)"
               @click="emitEventHandler('action-event',button,position,data,index)"
             >
             >
-              {{ button.label }}
+              {{ `&nbsp;${button.label}` }}
             </el-link>
             </el-link>
         </p>
         </p>
       </template>
       </template>
@@ -59,10 +59,10 @@
             @command="(action)=> { emitEventHandler('action-event',action,position,data,index) }"
             @command="(action)=> { emitEventHandler('action-event',action,position,data,index) }"
           >
           >
             <span v-if="button.buttonType==='link'" class="el-dropdown-link">
             <span v-if="button.buttonType==='link'" class="el-dropdown-link">
-              {{ button.label }}<i v-if="hasRighticon(button.rightIcon)" class="el-icon-arrow-down el-icon--right" />
+              {{ `&nbsp;${button.label}` }}<i v-if="hasRighticon(button.rightIcon)" class="el-icon-arrow-down el-icon--right" />
             </span>
             </span>
             <el-button v-else :type="getType(button)" size="mini" :icon="getIcon(button)">
             <el-button v-else :type="getType(button)" size="mini" :icon="getIcon(button)">
-              {{ button.label }}<i v-if="hasRighticon(button.rightIcon)" class="el-icon-arrow-down el-icon--right" />
+              {{ `&nbsp;${button.label}` }}<i v-if="hasRighticon(button.rightIcon)" class="el-icon-arrow-down el-icon--right" />
             </el-button>
             </el-button>
             <el-dropdown-menu v-if="button.menus && button.menus.length >0" slot="dropdown">
             <el-dropdown-menu v-if="button.menus && button.menus.length >0" slot="dropdown">
               <el-dropdown-item
               <el-dropdown-item

+ 1 - 0
src/views/platform/data/dataTemplate/list.vue

@@ -37,6 +37,7 @@
                                 <el-option label="模版名称" value="Q^name_^SL" />
                                 <el-option label="模版名称" value="Q^name_^SL" />
                                 <el-option label="模版key" value="Q^key_^SL" />
                                 <el-option label="模版key" value="Q^key_^SL" />
                                 <el-option label="数据集key" value="Q^dataset_key_^SL" />
                                 <el-option label="数据集key" value="Q^dataset_key_^SL" />
+                                <el-option label="模板类型" value="Q^type_^SL" />
                             </el-select>
                             </el-select>
                             <el-button slot="append" icon="el-icon-search" @click="search" />
                             <el-button slot="append" icon="el-icon-search" @click="search" />
                         </el-input>
                         </el-input>