cloud-web-corejs 1.0.54-dev.127 → 1.0.54-dev.129

package/src/components/table/tableForm.vue

@@ -20,7 +20,7 @@
       </div>
     </div>
     <vxe-form ref="searchForm" class="screen-box" :data="formData" title-width="92px" title-align="right"
-              v-if="form1Fields.length>0">
+              v-if="form1Fields.length>0" @submit="searchEvent">
       <template v-for="(form1Field,index) in form1Fields">
         <template v-if="!!form1Field.slot">
           <template v-if="form1Field.formItem===false">
@@ -103,6 +103,7 @@
           </vxe-form-item>
         </template>
       </template>
+      <vxe-button type="submit" @click="searchEvent" v-show="false"></vxe-button>
     </vxe-form>
     <advancedSearchDialog v-if="showAdvancedSearch" :visiable.sync="showAdvancedSearch" class="adSearchForm_all"
                            @confirm="confirmAdvancedSearchDialog"

package/src/components/table/tableFormMixin.js

@@ -8,6 +8,7 @@ modules = {
     formData: {
       type: Object,
     },
+
   },
   data() {
     return {
@@ -31,11 +32,12 @@ modules = {
     openAdvancedSearchDialog() {
       let $grid = this.$parent;
       let formData = this.formData;
+      let formData2 = this.$baseLodash.cloneDeep(this.formData);
       let advancedFormData = {};
       $grid.searchColumns.forEach((form1Field) => {
         let nullValue = this.getNullValue(form1Field);
         if (!form1Field.common) {
-          let value = formData[form1Field.field];
+          let value = formData2[form1Field.field];
           if (value !== null && value !== undefined) {
             advancedFormData[form1Field.field] = value;
           } else {
@@ -70,11 +72,12 @@ modules = {
     clearAdvancedSearchDialog() {
       let $grid = this.$parent;
       let formData = this.formData;
+      debugger
       let advancedFormData = this.advancedFormData;
       $grid.searchColumns.forEach((form1Field) => {
         let nullValue = this.getNullValue(form1Field);
         if (!form1Field.common) {
-          
+
           // formData[form1Field.field] = nullValue;
           if(formData[form1Field.field] && Array.isArray(formData[form1Field.field])  ){
             formData[form1Field.field].length = 0;
@@ -89,7 +92,7 @@ modules = {
           }
         }
       });
-      this.$emit("advancedClear");
+      this.$emit("advancedClear",formData);
     },
     searchEvent() {
       this.$emit("searchEvent");

package/src/components/xform/form-render/container-item/data-table-item.vue

@@ -100,7 +100,7 @@
                     </template>
                   </div>-->
 
-      <tableForm v-if="widget.options.isQueryTable" :formData.sync="formModel"
+      <tableForm v-if="widget.options.isQueryTable" :formData.sync="formModel" :xform="true"
                  @searchEvent="searchEvent" @resetEvent="resetEvent" @advancedClear="advancedClear"
                  @settingConfirm="tableFormSettingConfirm">
         <template #buttonLeft>

package/src/components/xform/form-render/container-item/data-table-mixin.js

@@ -1607,7 +1607,8 @@ modules = {
     },
     advancedClear() {
       let formModel = this.formModel;
-      this.getFormRef().setFormData(formModel);
+      // this.getFormRef().setFormData(formModel);
+      this.getGridTable().updateData();
     },
     tableFormSettingConfirm() {
       let formModel = this.formModel;

package/src/views/bd/setting/table_model/mixins/edit.js

@@ -570,7 +570,7 @@ modules = {
 
       let referenceEntity = this.referenceEntity;
       let refServiceName = this.refServiceName;
-      debugger
+
       let referenceZd = referenceEntity + "." + this.referenceKey;
       let referenceShowFields = this.referenceShowFields;
       let keys = referenceShowFields.map(item => {