Przeglądaj źródła

数据模板操作列多按时钮样式调整

cfort 2 lat temu
rodzic
commit
f527733fd3

+ 11 - 0
src/assets/styles/components/crud.scss

@@ -5,6 +5,7 @@
     .popper__arrow {
     .popper__arrow {
       display: none;
       display: none;
     }
     }
+
   }
   }
   
   
   .ibps-actions {
   .ibps-actions {
@@ -20,6 +21,16 @@
     .el-dropdown{
     .el-dropdown{
       margin:0 5px;
       margin:0 5px;
     }
     }
+    .more-btn {
+        margin-bottom: 10px;
+        padding: 0 30px 0 20px;
+      &:last-child {
+        margin-bottom: 5px;
+      }
+      &:first-child {
+        margin-top: 5px;
+      }
+    }
   }
   }
 }
 }
  .el-link {
  .el-link {

+ 1 - 1
src/business/platform/data/templaterender/templates/list.vue

@@ -1218,7 +1218,7 @@ export default {
                 if (!response) {
                 if (!response) {
                     return
                     return
                 }
                 }
-                ActionUtils.exportFile(response.data, this.dataTemplate.name + '_' + fecha.formatDate('yyyyMMddHHmmss') + '.xls')
+                ActionUtils.exportFile(response.data, this.dataTemplate.name + '_' + fecha.formatDate('yyyyMMddHHmmss') + '.xlsx')
             })
             })
         },
         },
         callbackExtFields (data) {
         callbackExtFields (data) {

+ 1 - 5
src/business/platform/form/formrender/dynamic-form/dynamic-form.vue

@@ -359,16 +359,13 @@
                         // 不是只读字段
                         // 不是只读字段
                         if (!FormOptions.t.NON_MODEL_FIELD_TYPES.includes(fieldType)) {
                         if (!FormOptions.t.NON_MODEL_FIELD_TYPES.includes(fieldType)) {
                             // 空值默认
                             // 空值默认
-                            const defaultValueEmpty = fieldOptions.uncheck==true?'': this.$utils.toBoolean(fieldOptions.default_value_empty, true)
+                            const defaultValueEmpty = fieldOptions.uncheck ? '' : this.$utils.toBoolean(fieldOptions.default_value_empty, true)
                             if (this.value && Object.keys(this.value).indexOf(fieldName) >= 0) {
                             if (this.value && Object.keys(this.value).indexOf(fieldName) >= 0) {
                                 // 有值
                                 // 有值
                                 const data = this.value[fieldName]
                                 const data = this.value[fieldName]
                                 if (this.$utils.isEmpty(data)) {
                                 if (this.$utils.isEmpty(data)) {
-                                    // console.log(defaultValueEmpty,'111111111111111111')
-
                                     if (defaultValueEmpty) {
                                     if (defaultValueEmpty) {
                                         const defaultValue = await FormUtils.getFieldDefaultValue(field)
                                         const defaultValue = await FormUtils.getFieldDefaultValue(field)
-                                        // console.log(defaultValueEmpty,defaultValue,'111111111111111111')
                                         this.models[fieldName] = defaultValue
                                         this.models[fieldName] = defaultValue
                                     }
                                     }
                                 } else {
                                 } else {
@@ -376,7 +373,6 @@
                                 }
                                 }
                             } else {
                             } else {
                                 // 默认值
                                 // 默认值
-                                // console.log(fieldName,field.field_name,'11111111111111111111')
                                 this.models[fieldName] = await FormUtils.getFieldDefaultValue(field)
                                 this.models[fieldName] = await FormUtils.getFieldDefaultValue(field)
                                 if (this.dynamicParams && this.dynamicParams[field.field_name]) {
                                 if (this.dynamicParams && this.dynamicParams[field.field_name]) {
                                     this.models[fieldName] = this.dynamicParams[field.field_name]
                                     this.models[fieldName] = this.dynamicParams[field.field_name]

+ 2 - 2
src/business/platform/form/utils/custom/joinCURD.js

@@ -41,10 +41,10 @@ const dealData = (args, type) => {
             sql: args.replace(/\n/g, ' ')
             sql: args.replace(/\n/g, ' ')
         }
         }
     }
     }
-    const data = typeof args === 'object' ? JSON.stringify(replaceNullWithEmpty(args)) : args
+    const data = typeof args === 'object' ? replaceNullWithEmpty(args) : args
     const res = {
     const res = {
         ciphertext: encryptByAes(data),
         ciphertext: encryptByAes(data),
-        plaintext: args
+        plaintext: data
     }
     }
     return JSON.stringify(res)
     return JSON.stringify(res)
 }
 }

+ 1 - 1
src/components/ibps-crud/index.vue

@@ -347,7 +347,7 @@
                                 </template>
                                 </template>
                                 <template v-if="rowHandleMoreActions && rowHandleMoreActions.length > 1">
                                 <template v-if="rowHandleMoreActions && rowHandleMoreActions.length > 1">
                                     <div class="el-divider el-divider--vertical" />
                                     <div class="el-divider el-divider--vertical" />
-                                    <el-dropdown>
+                                    <el-dropdown placement="top">
                                         <!-- <i class="el-icon-caret-bottom el-dropdown-link" style="font-size:14px;">更多</i> -->
                                         <!-- <i class="el-icon-caret-bottom el-dropdown-link" style="font-size:14px;">更多</i> -->
                                         <i class="ibps-icon ibps-icon-chevron-down" style="font-size:12px; color: #409eff; cursor: pointer;"> 更多</i>
                                         <i class="ibps-icon ibps-icon-chevron-down" style="font-size:12px; color: #409eff; cursor: pointer;"> 更多</i>
                                         <el-dropdown-menu slot="dropdown" class="ibps-table-dropdown-menu">
                                         <el-dropdown-menu slot="dropdown" class="ibps-table-dropdown-menu">

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

@@ -42,7 +42,7 @@
                 />
                 />
             </template>
             </template>
             <template v-else-if="type==='linkHide'">
             <template v-else-if="type==='linkHide'">
-                <div :key="button.key+index" style="margin-top: 5px;">
+                <div :key="button.key+index" class="more-btn">
                     <el-link
                     <el-link
                         v-if="handleActionHidden(button.hidden)"
                         v-if="handleActionHidden(button.hidden)"
                         :key="button.key+index"
                         :key="button.key+index"