Merge branch 'master' of https://a.leanwo.com:3000/prodog-client-2023/pc-component-v3

package.json

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

packages/info/src/QueryCondition.vue

@@ -41,6 +41,7 @@
             v-model:visible="searchVisible"
             title="高级查询"
             width="440px"
+            style="z-index: 1050;"
             placement="right"
             @close="closeSearch"
           >
@@ -112,6 +113,7 @@ export default {
       filterFields: [],
       selectedText: [],
       searchVisible:false,
+      searchType:'simple',
     };
   },
 
@@ -168,9 +170,9 @@ export default {
     getQueryCondition: function () {
       var _self = this;
       var values = [];
-      if (_self.isComplex === false) {
+      if (_self.searchType === 'simple') {
         values = this.$refs.queryConditionSimple.getQueryCondition();
-      } else if (_self.isComplex === true) {
+      } else if (_self.searchType === 'complex') {
         values = this.$refs.queryConditionComplex.getQueryCondition();
       }
       return values;
@@ -180,9 +182,10 @@ export default {
          * 触发简单查询
          * @return {void} 
          */
-    simpleSearch: function () {
+    simpleSearch: function (value) {
       this.isSimple = true;
-      this.$emit('simpleSearch');
+      this.searchType = value;
+      this.$emit('simpleSearch','simple');
     },
 
 
@@ -202,9 +205,10 @@ export default {
          * 回车键查询
          * @return {void} 
          */
-    complexSearch: function () {
+    complexSearch: function (value) {
       this.isSimple = false;
-      this.$emit('complexSearch');
+      this.searchType = value;
+      this.$emit('complexSearch','complex');
     },
 
     /**

packages/info/src/QueryConditionComplex.vue

@@ -58,6 +58,15 @@
               "
               class="form-control form-control-complex form-input"
             />
+            <input
+              v-if="item.displayType =='TextEditor' && !item.apiUrl"
+              :id="item.id"
+              v-model="item.value.value1"
+              autocomplete="off"
+              type="text"
+              :placeholder="$t('lang.QueryConditionComplex.pleaseInputTheContent')"
+              class="form-control form-control-complex form-input"
+            />
             <input
               v-if="item.displayType =='NumberEditor'"
               :id="item.id"
@@ -157,6 +166,15 @@
               class="form-control form-control-complex form-input"
               @keyup.enter="complexSearch()"
             />
+            <input
+              v-if="item.displayType =='TextEditor' && !item.apiUrl"
+              :id="item.id"
+              v-model="item.value.value1"
+              autocomplete="off"
+              type="text"
+              :placeholder="$t('lang.QueryConditionComplex.pleaseInputTheContent')"
+              class="form-control form-control-complex form-input"
+            />
             <input
               v-if="item.displayType =='NumberEditor'"
               :id="item.id"
@@ -376,7 +394,7 @@ export default {
          * @return {void} 
          */
     complexSearch: function () {
-      this.$emit('complexSearch');
+      this.$emit('complexSearch','complex');
     },
 
     /**

packages/info/src/QueryConditionSimple.vue

@@ -96,7 +96,7 @@ export default {
          * @return {void} 
          */
     simpleSearch: function () {
-      this.$emit('simpleSearch');
+      this.$emit('simpleSearch','simple');
     },
 
     /**

packages/info/src/QueryPage.vue

@@ -315,6 +315,7 @@ export default {
       loading: false,
       modal: false,
       isComplex:false,
+      searchType:'simple',
     };
   },
   computed: {
@@ -503,8 +504,9 @@ export default {
       _self.simpleSearch();
     },
 
-    complexSearch: function () {
+    complexSearch: function (value) {
       var _self = this;
+      _self.searchType = value;
       _self.pagination.current_page = 1;
       var infoQueryParam = {
         infoWindowNo: _self.infoWindowDto.no,
@@ -530,10 +532,10 @@ export default {
       _self.infoQueryParam.infoFilterFieldValues =
         _self.$refs.queryCondition.getQueryCondition();
       // var isSimpleQuery = _self.$refs.queryCondition.isSimpleQuery();
-      if (this.isComplex == false) {
-        _self.queryInfoWindowDataSimple();
-      } else {
+      if (_self.searchType === 'complex') {
         _self.queryInfoWindowDataComplex();
+      } else {
+        _self.queryInfoWindowDataSimple();
       }
     },
 
@@ -541,8 +543,9 @@ export default {
      * 简单查询
      * @return {void}
      */
-    simpleSearch: function () {
+    simpleSearch: function (value) {
       var _self = this;
+      _self.searchType = value;
       _self.pagination.current_page = 1;
       var infoQueryParam = {
         infoWindowNo: _self.infoWindowDto.no,
@@ -574,7 +577,6 @@ export default {
         data: JSON.stringify(_self.infoQueryParam),
         success: function (data) {
           _self.loading = false;
-
           _self.setSelectedFlag(data);
           _self.infoWindowData = data;