1.1.10 修改生单适应新查询窗口

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pc-component-v3",
-  "version": "1.0.99",
+  "version": "1.1.10",
   "description": "",
   "main": "dist/pc-component-v3.js",
   "scripts": {

packages/info/src/DocGenerator.vue

@@ -10,10 +10,8 @@
     </li>
     <li role="presentation" :class="{ active: tabIndex === 2 }">
       <a
-        @click="
-          tabIndex = 2;
-          isComplex = true;
-          isGenerator = true;
+        @click="advancedQuery
+
         "
       >{{ $t("lang.QueryCondition.advancedQuery") }}</a>
     </li>
@@ -24,39 +22,22 @@
   <div class="grid-container-2">
     <div class="grid-header-2">
       <QueryCondition
-        ref="queryCondition"
-        :info-filter-fields="infoFilterFields"
-        :is-search-widget="true"
-        :show-button="true"
-        :info-window-no="infoWindowDto.no"
-        :is-complex="isComplex"
-        :is-generator="isGenerator"
-        @open-complex="openComplex"
-        @simple-search="simpleSearch"
-        @complex-search="complexSearch"
-        @refresh-search="queryInfoWindowData"
-        @change-search="tabIndex = 1"
+        ref="queryCondition" :info-filter-fields="infoFilterFields" :is-search-widget="isSearchWidget"
+        :show-button="true" :info-window-no="infoWindowDto.no" :is-complex="isComplex" :is-generator="isGenerator"
+        :search-condition-instance="searchConditionInstance" @open-complex="openComplex" @simple-search="simpleSearch"
+        @complex-search="complexSearch" @refresh-search="queryInfoWindowData" @change-search="tabIndex = 1"
       />
     </div>
     <div class="grid-content-2">
       <DocGeneratorGrid
-        v-show="tabIndex !== 3"
-        ref="docGeneratorGrid"
-        :info-window-no="infoWindowNo"
-        :info-grid-fields="infoGridFields"
-        :info-window-data="infoWindowData"
-        :is-selected-by-id="isSelectedById"
-        @refresh-search="queryInfoWindowData"
-        @select-changed="selectChanged"
+        v-show="tabIndex !== 3" ref="docGeneratorGrid" :info-window-no="infoWindowNo"
+        :info-grid-fields="infoGridFields" :info-window-data="infoWindowData" :is-selected-by-id="isSelectedById"
+        @refresh-search="queryInfoWindowData" @select-changed="selectChanged"
       />
 
       <DocGeneratorSelected
-        v-show="tabIndex === 3"
-        ref="docGeneratorSelected"
-        :info-window-no="infoWindowNo"
-        :info-grid-fields="infoGridFields"
-        @select-changed="deleteChange"
-        @update-datas="updateDatas"
+        v-show="tabIndex === 3" ref="docGeneratorSelected" :info-window-no="infoWindowNo"
+        :info-grid-fields="infoGridFields" @select-changed="deleteChange" @update-datas="updateDatas"
       />
     </div>
 
@@ -71,6 +52,7 @@ import QueryCondition from './QueryCondition.vue';
 import DocGeneratorSelected from './DocGeneratorSelected.vue';
 import DocGeneratorGrid from './DocGeneratorGrid.vue';
 
+import { useSearchCondition } from './InfoWindowState.js';
 export default {
   name: 'DocGenerator',
 
@@ -90,10 +72,14 @@ export default {
       type: String,
       default: null,
     },
-    whereClauseSource:{
+    whereClauseSource: {
       type: String,
       default: null,
     },
+    isSearchWidget: {
+      type: Boolean,
+      default: false,
+    },
   },
 
   data: function () {
@@ -107,7 +93,8 @@ export default {
       loading: false,
       isComplex: false,
       isGenerator: false,
-      searchType:'simple',
+      searchType: 'simple',
+      searchConditionInstance: useSearchCondition(),
     };
   },
 
@@ -163,6 +150,13 @@ export default {
       this.tabIndex = 3;
       this.isGenerator = true;
     },
+
+    advancedQuery: function () {
+      this.tabIndex = 2;
+      this.isComplex = true;
+      this.isGenerator = true;
+      this.searchConditionInstance.state.isComplex = true;
+    },
     /**
      * 根据用户配置更新查询窗口的定义
      * @author YangZhiJie 20210909
@@ -405,7 +399,7 @@ export default {
 
 <style scoped>
 /** 修复分页的样式 By YangZhiJie 2021-07-06 11:23 */
-nav >>> ul.pagination {
+nav>>>ul.pagination {
   margin: 0 !important;
 }