Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/business/platform/data/templaterender/templates/list.vue

@@ -630,6 +630,7 @@ export default {
          * 记忆选择核心方法
          */
         changePageCoreRecordData () {
+            // 如果是单选，则将总选择清空
             // 如果总记忆中还没有选择的数据，那么就直接取当前页选中的数据，不需要后面一系列计算
             if (this.$utils.isEmpty(this.selectionAll)) {
                 this.selectionAll = this.selection ? JSON.parse(JSON.stringify(this.selection)) : []
@@ -646,7 +647,6 @@ export default {
             } else {
                 selectionAll.push(this.selectionAll)
             }
-
             // 获取当前页选中的id
             const selectIds = []
             if (this.multiple) {
@@ -661,7 +661,7 @@ export default {
             } else {
                 if (this.$utils.isNotEmpty(this.selection)) {
                     const pkValue = this.getPkValue(this.selection)
-                    // selectIds.push(pkValue)
+                    selectIds.push(pkValue)
                     if (selectAllIds.indexOf(pkValue) < 0) {
                         selectionAll = []
                         selectionAll.push(this.selection)
@@ -673,7 +673,6 @@ export default {
                     }
                 }
             }
-
             const noSelectIds = []
             // 得到当前页没有选中的id
             listData.forEach((row) => {

src/components/ibps-crud/mixin/base.js

@@ -280,12 +280,12 @@ export default {
             } else { // 管理列
                 selection = data ? this.getPkValue(data) : null
             }
-            this.$emit('action-event', buttonKey, position, selection, data, index, action)
-            // if(this.$utils.isArray(data)){
-            //     this.$emit('action-event', buttonKey, position, selection, this.selectionAll, index, action)
-            // }else{
-            //     this.$emit('action-event', buttonKey, position, selection, data, index, action)
-            // }
+            // this.$emit('action-event', buttonKey, position, selection, data, index, action)
+            if (this.$utils.isArray(data) && this.selectionAll !== null) {
+                this.$emit('action-event', buttonKey, position, selection, this.selectionAll, index, action)
+            } else {
+                this.$emit('action-event', buttonKey, position, selection, data, index, action)
+            }
         },
 
         /**

src/views/component/dataAnalysisDialog.vue

@@ -28,6 +28,7 @@
                 <el-input
                     style="width:50%;"
                     type="textarea"
+                    :rows="5"
                     placeholder="请输入内容"
                     v-model="verificationMethodTextarea"
                     maxlength="500"
@@ -41,6 +42,7 @@
                 <el-input
                     style="width:50%;"
                     type="textarea"
+                    :rows="5"
                     placeholder="请输入内容"
                     v-model="criteriaTextarea"
                     maxlength="500"
@@ -54,6 +56,7 @@
                 <el-input
                     style="width:50%;"
                     type="textarea"
+                    :rows="5"
                     placeholder="请输入内容"
                     v-model="maintenanceTextarea"
                     maxlength="500"
@@ -66,6 +69,7 @@
                 <el-input
                     style="width:50%;"
                     type="textarea"
+                    :rows="5"
                     placeholder="请输入内容"
                     v-model="dataStoreTextarea"
                     maxlength="500"
@@ -104,7 +108,7 @@ export default {
         },
         top: {
             type: String,
-            default: '10%'
+            default: '0%'
         },
         editFromType: {
             type: String,
@@ -122,13 +126,13 @@ export default {
         
         const subtableConfiguration = ()=> {
             let zbTable = this.dynamicParams.formObj.formDefData.fields.find(i => i.field_name == "t_sjfxzb").field_options.columns
-            let zblbTable = zbTable.find(i => i.field_name == "zhiBiaoId").field_options.options
+            let zblbTable = zbTable.find(i => i.name == "zhiBiaoId").field_options.options
             
             return zblbTable;
         }
         const subtableTypeConfiguration = ()=> {
             let zbTable = this.dynamicParams.formObj.formDefData.fields.find(i => i.field_name == "t_sjfxzb").field_options.columns
-            let zblbTable = zbTable.find(i => i.field_name == "leiXing").field_options.options
+            let zblbTable = zbTable.find(i => i.name == "leiXing").field_options.options
             // console.log(zblbTable)
             return zblbTable;
         }
@@ -355,6 +359,7 @@ export default {
 <style lang="scss" >
 .form-renderer-dialog {
     .el-dialog__body {
+        margin: 0 10px 10px 10px;
         padding: 10px 0 5px 0;
     }
     .el-dialog__headerbtn {
@@ -373,10 +378,11 @@ export default {
 .maintenanceCycle{
     display: flex;
     align-items: center;
-    margin: 2%;
+    // margin: 2%;
+    margin-bottom: 6px !important;
 }
 .maintenanceFont{
-    width: 10%;
+    width: 8%;
 }
 .marginNone{
     margin: 0;