2.1.3 大屏版本发布

ant-design-vue-jeecg/src/views/jeecg/JeecgDemoList.vue

@@ -47,7 +47,7 @@
           </span>
           <a-col :md="6" :sm="24">
 
-            <template v-if="superQueryFlag">
+       <!--     <template v-if="superQueryFlag">
               <a-tooltip title="已有高级查询条件生效!">
                 <button :disabled="false" class="ant-btn ant-btn-primary" @click="superQuery">
                   <a-icon type="appstore" theme="twoTone" spin="true"></a-icon>
@@ -56,6 +56,9 @@
               </a-tooltip>
             </template>
             <a-button v-else type="primary" @click="superQuery" icon="filter">高级查询</a-button>
+-->
+            <!-- 高级查询区域 -->
+            <j-super-query :fieldList="fieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
 
             <a @click="handleToggleSearch" style="margin-left: 8px">
               {{ toggleSearchStatus ? '收起' : '展开' }}
@@ -167,8 +170,6 @@
     <!-- 一对多表单区域 -->
     <JeecgDemoTabsModal ref="jeecgDemoTabsModal" @ok="modalFormOk"></JeecgDemoTabsModal>
 
-    <!-- 高级查询区域 -->
-    <j-super-query :fieldList="fieldList" ref="superQueryModal" @handleSuperQuery="handleSuperQuery"></j-super-query>
   </a-card>
 </template>
 
@@ -293,7 +294,14 @@
     methods: {
       getQueryParams(){
         console.log(this.queryParam.birthdayRange)
-        var param = Object.assign({}, this.queryParam,this.isorter);
+
+        //高级查询器
+        let sqp = {}
+        if(this.superQueryParams){
+          sqp['superQueryParams']=encodeURI(this.superQueryParams)
+        }
+        var param = Object.assign(sqp, this.queryParam, this.isorter ,this.filters);
+
         param.field = this.getQueryField();
         param.pageNo = this.ipagination.current;
         param.pageSize = this.ipagination.pageSize;

ant-design-vue-jeecg/src/views/jeecg/PrintDemo.vue

@@ -132,23 +132,32 @@
   }
 </script>
 <style scoped>
+  /*update_begin author:scott date:20191203 for:打印机打印的字体模糊问题 */
+  * {
+    color: #000000!important;
+    -webkit-tap-highlight-color: #000000!important;
+  }
+  /*update_end author:scott date:20191203 for:打印机打印的字体模糊问题 */
+
   .abcdefg .ant-card-body{
     margin-left: 0%;
     margin-right: 0%;
     margin-bottom: 1%;
     border:0px solid black;
     min-width: 800px;
+    color:#000000!important;
   }
   .explain{
     text-align: left;
     margin-left: 50px;
+    color:#000000!important;
   }
   .explain .ant-input,.sign .ant-input{
     font-weight:bolder;
     text-align:center;
     border-left-width:0px!important;
-    border-top-width:0px!important;;
-    border-right-width:0px!important;;
+    border-top-width:0px!important;
+    border-right-width:0px!important;
   }
   .explain div{
     margin-bottom: 10px;

ant-design-vue-jeecg/src/views/jeecg/modules/JEditableTable/DefaultTable.vue

@@ -63,6 +63,10 @@
                 pattern: /^[a-z|A-Z][a-z|A-Z\d_-]{0,}$/, // 正则
                 message: '${title}必须以字母开头，可包含数字、下划线、横杠'
               },
+              {
+                unique: true,
+                message: '${title}不能重复'
+              },
               {
                 handler(type, value, row, column, callback, target) {
                   // type 触发校验的类型（input、change、blur）
@@ -73,25 +77,13 @@
                   // target 行编辑的实例对象
 
                   if (type === 'blur') {
-                    let { values } = target.getValuesSync({ validate: false })
-
                     if (value === 'abc') {
-                      callback(false, '${title}不能是abc')  // false = 未验证
-                      return
+                      callback(false, '${title}不能是abc')  // false = 未通过校验
+                    } else {
+                      callback(true) // true = 通过验证
                     }
-
-                    let count = 0
-                    for (let val of values) {
-                      if (val['dbFieldName'] === value) {
-                        if (++count >= 2) {
-                          callback(false, '${title}不能重复==')
-                          return
-                        }
-                      }
-                    }
-                    callback(true) // true = 通过验证
                   } else {
-                    callback() // 不填写或者填写 null 代表不进行任何操作
+                    callback(true) // 不填写或者填写 null 代表不进行任何操作
                   }
                 },
                 message: '${title}默认提示'