cloud-web-corejs 1.0.54-dev.369 → 1.0.54-dev.370

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.369",
+  "version": "1.0.54-dev.370",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/components/xform/form-designer/form-widget/dialog/searchFormDialog.vue

@@ -6,12 +6,24 @@
     v-bind="dialogConfig"
     @close="close"
   >
-    <div class="cont" style="height:450px" v-bind="bodyConfig">
-      <v-form-render :form-json.sync="formJson" :form-data="formData" :option-data="optionData" ref="vFormRef"
-                     :reportTemplate.sync="formTemplate" :conditionParam.sync="conditionParam"
-                     :formInsData.sync="formInsData" v-if="showRender" visible-key="showRender" :parent-target="_self"
-                     @reload="reload" :dataTableOption="dataTableOption" v-bind="formConfig" :param="dialogParam"
-                     class="data-table_height"/>
+    <div class="cont" style="height: 450px" v-bind="bodyConfig">
+      <v-form-render
+        :form-json.sync="formJson"
+        :form-data="formData"
+        :option-data="optionData"
+        ref="vFormRef"
+        :reportTemplate.sync="formTemplate"
+        :conditionParam.sync="conditionParam"
+        :formInsData.sync="formInsData"
+        v-if="showRender"
+        visible-key="showRender"
+        :parent-target="_self"
+        @reload="reload"
+        :dataTableOption="dataTableOption"
+        v-bind="formConfig"
+        :param="dialogParam"
+        class="data-table_height"
+      />
     </div>
     <label id="labBtn" class="transverse">
       <div class="icon">
@@ -20,46 +32,54 @@
       </div>
     </label>
     <div class="multipleChoice">
-      <el-tooltip :enterable="false" effect="dark" :content="$t1('全部删除')" placement="top"><a
-        class="allDel icon-quanbushanchu"
-        @click="clearChecked()"></a>
+      <el-tooltip
+        :enterable="false"
+        effect="dark"
+        :content="$t1('全部删除')"
+        placement="top"
+        ><a class="allDel icon-quanbushanchu" @click="clearChecked()"></a>
       </el-tooltip>
       <div class="list">
         <template v-if="showRender">
-          <div class="item" v-for="(checkRow, index) in checkRows" :key="'c'+index">
+          <div class="item" v-for="(checkRow, index) in checkRows" :key="'c' + index">
             <p>{{ checkRow[showFormField] }}</p>
             <a class="el-icon-close" @click="clearTable1Select(index)"></a>
           </div>
         </template>
       </div>
     </div>
-    <span slot="footer" class="dialog-footer" v-if="option.showFooter!==false" v-bind="option.footerConfig">
-			<span class="fl tips" v-if="!selectMulti">{{ $t1('注：双击确认选择（单选）') }}</span>
-			<el-button type="primary" plain class="button-sty" @click="close">
-				<i class="el-icon-close el-icon"></i>
-				{{ $t1('取 消') }}
-			</el-button>
-			<el-button type="primary" @click="dialogSubmit" class="button-sty">
-				<i class="el-icon-check el-icon"></i>
-				{{ $t1('确 定') }}
-			</el-button>
-		</span>
+    <span
+      slot="footer"
+      class="dialog-footer"
+      v-if="option.showFooter !== false"
+      v-bind="option.footerConfig"
+    >
+      <span class="fl tips" v-if="!selectMulti">{{
+        $t1("注：双击确认选择（单选）")
+      }}</span>
+      <el-button type="primary" plain class="button-sty" @click="close">
+        <i class="el-icon-close el-icon"></i>
+        {{ $t1("取 消") }}
+      </el-button>
+      <el-button type="primary" @click="dialogSubmit" class="button-sty">
+        <i class="el-icon-check el-icon"></i>
+        {{ $t1("确 定") }}
+      </el-button>
+    </span>
   </el-dialog>
 </template>
 
 <script>
-import {selectDialogMixins} from '../../../../../mixins/selectDialog/index.js';
+import { selectDialogMixins } from "../../../../../mixins/selectDialog/index.js";
 import VFormRender from "../../../../../components/xform/form-render/index.vue";
 
 export default {
   // name: "vabSearchDialog",
-  components: {VFormRender},
-  props: ['visiable', 'multi', 'rows', 'param', 'widget', 'option'],
+  components: { VFormRender },
+  props: ["visiable", "multi", "rows", "param", "widget", "option"],
   mixins: [selectDialogMixins],
   inject: ["getFormConfig"],
-  mounted() {
-
-  },
+  mounted() {},
   data() {
     var that = this;
     return {
@@ -97,12 +117,12 @@ export default {
           checkboxConfig: {
             checkStrictly: true,
             showHeader: true,
-            trigger: 'row'
-          }
-        }
+            trigger: "row",
+          },
+        },
       },
       $grid: null,
-      currentLayoutType: null
+      currentLayoutType: null,
     };
   },
   computed: {
@@ -118,7 +138,7 @@ export default {
     dialogConfig() {
       let customClass = "dialog-style list-dialog dialog-checkbox pd_0";
       if (this.option.dialogConfig?.customClass) {
-        customClass = customClass + " " + this.option.dialogConfig.customClass
+        customClass = customClass + " " + this.option.dialogConfig.customClass;
       }
       let config = {
         title: this.formTemplate.formName,
@@ -129,41 +149,41 @@ export default {
         width: "1200px",
         fullscreen: this.option.fullscreen,
       };
-      config = Object.assign({}, config, this.option.dialogConfig, {customClass});
+      config = Object.assign({}, config, this.option.dialogConfig, { customClass });
       config.title = this.$t1(config.title);
       return config;
     },
     bodyConfig() {
       let config = {};
-      let classStr = this.currentLayoutType
+      let classStr = this.currentLayoutType;
       if (this.option.bodyConfig?.class) {
         classStr = classStr + " " + this.option.bodyConfig.class;
       }
       if (this.option.showFooter == false) {
         classStr = classStr + " nfootBtn";
       }
-      config = Object.assign({}, config, this.option.bodyConfig, {class: classStr});
+      config = Object.assign({}, config, this.option.bodyConfig, { class: classStr });
       return config;
-    }
+    },
   },
   created() {
     let currentFormConfig = this.getFormConfig();
-    this.currentLayoutType = currentFormConfig.layoutType
+    this.currentLayoutType = currentFormConfig.layoutType;
     this.initSetting();
 
     if (this.option.rows?.length) {
-      this.checkRows.push(...this.$baseLodash.cloneDeep(this.option.rows))
+      this.checkRows.push(...this.$baseLodash.cloneDeep(this.option.rows));
     }
 
     this.selectMulti = this.option.multiple ?? true;
     this.dataTableOption.config.checkboxConfig.showHeader = this.selectMulti;
-    if(this.option.queryParam){
+    if (this.option.queryParam) {
       this.dataTableOption.queryParam = this.option.queryParam;
     }
     this.getReportTemplate();
   },
   methods: {
-    reload(){
+    reload() {
       this.showRender = false;
       this.getReportTemplate();
     },
@@ -171,12 +191,12 @@ export default {
       let param = {
         objTypeCode: this.$attrs.objTypeCode,
         objId: this.$attrs.objId,
-        taskId: this.$attrs.taskId
+        taskId: this.$attrs.taskId,
       };
       this.conditionParam = param;
       let url, data;
       url = USER_PREFIX + `/formTemplate/getByFormCode`;
-      data = {stringOne: this.formCode}
+      data = { stringOne: this.formCode };
 
       let that = this;
       this.$http({
@@ -186,11 +206,13 @@ export default {
         isLoading: true,
         loadingTarget: document.body,
         modalStrictly: true,
-        success: res => {
+        success: (res) => {
           let formTemplate = res.objx || {};
           this.formTemplate = formTemplate;
-          this.formJson = formTemplate.formViewContent ? JSON.parse(formTemplate.formViewContent) : {};
-          this.layoutType = this.formJson.formConfig.layoutType
+          this.formJson = formTemplate.formViewContent
+            ? JSON.parse(formTemplate.formViewContent)
+            : {};
+          this.layoutType = this.formJson.formConfig.layoutType;
           let formConfig = this.formJson.formConfig;
           if (formConfig.searchDialogUniqueField) {
             this.fieldKey = formConfig.searchDialogUniqueField;
@@ -203,27 +225,27 @@ export default {
           })*/
           this.initShowFormField();
           this.showRender = true;
-
-
-        }
+        },
       });
     },
-    getGrid(){
-      if(!this.$grid){
+    getGrid() {
+      if (!this.$grid) {
         let widgetList = this.formJson.widgetList;
-        this.$grid = this.$refs.vFormRef.getWidgetRef(widgetList[0].options.name).getGridTable();
+        this.$grid = this.$refs.vFormRef
+          .getWidgetRef(widgetList[0].options.name)
+          .getGridTable();
       }
       return this.$grid;
     },
     initShowFormField() {
       let showFormField = this.formJson.formConfig.searchDialogNameField || null;
       if (!showFormField) {
-        let widgetList = this.formJson.widgetList
+        let widgetList = this.formJson.widgetList;
         let tableColumns = widgetList[0].options.tableColumns;
-        let column = tableColumns.find(column => !!column.prop);
+        let column = tableColumns.find((column) => !!column.prop);
         this.showFormField = column.prop;
-      }else{
-        this.showFormField = showFormField
+      } else {
+        this.showFormField = showFormField;
       }
     },
     async getFormInsData() {
@@ -236,17 +258,17 @@ export default {
         method: `post`,
         data: {
           insUuid: insUuid,
-          tableAlias: this.formCode
+          tableAlias: this.formCode,
         },
         isLoading: true,
         loadingTarget: document.body,
         modalStrictly: true,
-        success: res => {
+        success: (res) => {
           let formData = res.objx && res.objx.data ? res.objx.data : {};
           this.formData = formData;
           this.formInsData = res.objx;
           // this.formInsData = formData;
-        }
+        },
       });
     },
     changeH5Checkbox(obj) {
@@ -257,7 +279,7 @@ export default {
       if (selectMulti) {
         let rows = this.checkRows;
         if (obj.checked) {
-          let flag = rows.some(item => {
+          let flag = rows.some((item) => {
             return row[fieldKey] == item[fieldKey];
           });
           if (!flag) {
@@ -288,7 +310,7 @@ export default {
       if (selectMulti) {
         let rows = this.checkRows;
         if (obj.checked) {
-          let flag = rows.some(item => {
+          let flag = rows.some((item) => {
             return row[fieldKey] == item[fieldKey];
           });
           if (!flag) {
@@ -313,8 +335,9 @@ export default {
       }
 
       if (obj.checked) {
-        let ay = $table1.getTableData().fullData;
-        let aRows = this.findAllRows(ay);
+        // let ay = $table1.getTableData().fullData;
+        // let aRows = this.findAllRows(ay);
+        let aRows = $table1.getTableData().visibleData;
         let cRows = $table1.getCheckboxRecords();
         if (aRows.length == cRows.length) {
           $table1.setAllCheckboxRow(true);
@@ -335,7 +358,8 @@ export default {
         var rowid = row[fieldKey];
         let $grid1 = this.getGrid();
 
-        let rows = $grid1.getTableData().fullData;
+        // let rows = $grid1.getTableData().fullData;
+        let rows = $grid1.getTableData().visibleData;
         let row2 = this.findTreeRowById(rows, rowid);
         if (selectMulti) {
           if (row2) $grid1.setCheckboxRow(row2, false);
@@ -350,10 +374,12 @@ export default {
       if (this.currentLayoutType !== "H5") {
         let fieldKey = this.fieldKey;
         var $grid = res.$grid;
-        let tableData = $grid.getTableData().fullData;
-        let allRows = this.findAllRows(tableData);
+        // let tableData = $grid.getTableData().fullData;
+        // let allRows = this.findAllRows(tableData);
+        let tableData = $grid.getTableData().visibleData;
+        let allRows = $grid.getTableData().visibleData;
         $grid.setCheckboxRow(allRows, res.checked);
-        allRows.forEach(lineData => {
+        allRows.forEach((lineData) => {
           let rowid = lineData[fieldKey];
           let tableData2 = this.checkRows;
           let row2;
@@ -380,7 +406,7 @@ export default {
               if (delIndex != null) checkRows.splice(delIndex, 1);
             }
           }
-        })
+        });
       }
     },
     clearChecked() {
@@ -402,7 +428,7 @@ export default {
     close() {
       let formRef = this.$refs.vFormRef;
       this.showDialog = false;
-      this.$emit('update:visiable', false);
+      this.$emit("update:visiable", false);
       this.option.close && this.option.close(formRef, this);
     },
     dialogSubmit() {
@@ -414,11 +440,9 @@ export default {
       } else {
         this.close();
       }
-    }
-
-
-  }
-}
+    },
+  },
+};
 </script>
 
 <style scoped>