aXin-0810 пре 2 година
родитељ
комит
1648b7152f
3 измењених фајлова са 6 додато и 5 уклоњено
  1. 3 3
      package-lock.json
  2. 1 1
      package.json
  3. 2 1
      src/components/template/template-page-1.vue

+ 3 - 3
package-lock.json

@@ -4267,9 +4267,9 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "@zjlib/element-plugins": {
-      "version": "2.2.2",
-      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.2.2.tgz",
-      "integrity": "sha512-XrN/DLOtSMVeBay3hnRbd3wXnkZ3IBmUD6z48+h+PkbuzBxwag2da9TMfnC00eoimmAtLp3Rl0MQXMLB/eJ5wA==",
+      "version": "2.2.3",
+      "resolved": "http://121.41.110.30:4873/@zjlib%2felement-plugins/-/element-plugins-2.2.3.tgz",
+      "integrity": "sha512-PJGSdzWqa0JGGe1tVL2HC2NvkcqEpjcl5/FVj5HGRyyndDLplA+JHpZhrAwScLPh66267mbLctaKWGU9MrqIHA==",
       "requires": {
         "@turf/turf": "^6.5.0",
         "@vuemap/vue-amap": "^0.1.12",

+ 1 - 1
package.json

@@ -15,7 +15,7 @@
     "test:ci": "npm run lint && npm run test:unit"
   },
   "dependencies": {
-    "@zjlib/element-plugins": "^2.2.2",
+    "@zjlib/element-plugins": "^2.2.3",
     "axios": "0.18.1",
     "clipboard": "^2.0.8",
     "concurrent-tasks": "^1.0.7",

+ 2 - 1
src/components/template/template-page-1.vue

@@ -464,6 +464,7 @@ export default {
             ...item.exportField,
             sortNum: index,
             isCopy: item.isCopy,
+            tiling: item.tiling,
             isTotal: item.isTotal,
             isShow: !item.hidden,
             moduleId: this.moduleId,
@@ -536,7 +537,7 @@ export default {
           pageSize: -1,
           params: querylist.map(item => {
             if (
-              item.compare === '=' &&
+              // item.compare === '=' &&
               typeof item.value == 'string' &&
               (~item.value.indexOf(',') || ~item.value.indexOf(','))
             ) {