three-trees-ui 1.0.38 → 1.0.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "three-trees-ui",
-  "version": "1.0.38",
+  "version": "1.0.40",
   "publicPath": "/ui",
   "author": "hotent",
   "private": false,

package/packages/OrgPostDialog/src/main.vue

@@ -68,7 +68,7 @@
       },
       quickSearchProps: {
         type: String,
-        default: 'name,code,pathName',
+        default: 'name,code',
       },
       pageSize: {
         type: Number,

package/packages/TemplateForm/src/main.vue

@@ -35,7 +35,7 @@
           :disabled="disabled"
           @click="boSave()"
         >
-          保存
+          提交
         </el-button>
         <!-- <el-button
           v-if="action === 'editDraft'"

package/src/mixins/querySqlPreview.js

@@ -584,7 +584,7 @@ export default {
         this.dialogExportVisible = true
       } else {
         // 增加导出字段限制
-        const checkField = this.getCheckField().map((item) => item.value)
+        const checkField = this.getCheckField().map((item) => item.key)
         this.exportData.expField = this.displayFields.filter((item) =>
           checkField.includes(item.fieldName)
         )
@@ -894,9 +894,12 @@ export default {
       const checkField = JSON.parse(
         decode(customColumnSetting[customColumnsHashCode]) || '[]'
       )
-      return checkField.filter(
-        (field) => field.checked && ['序号', '操作'].indexOf(field.value) == -1
-      )
+      return checkField.length
+        ? checkField.filter(
+            (field) =>
+              field.checked && ['序号', '操作'].indexOf(field.value) == -1
+          )
+        : customColumns
     },
   },
 }

package/src/mixins/templatePreview.js

@@ -2432,7 +2432,7 @@ export default {
       if (type === 'searchResult') {
         this.curSelectParams.queryFilter.querys = this.templateSearchQuery
       }
-	  // 增加导出字段限制
+      // 增加导出字段限制
       const checkField = this.getCheckField()
       if (checkField && checkField.length) {
         let fieldExport = {}
@@ -4612,7 +4612,7 @@ export default {
         return strData
       }
     },
-	getCheckField() {
+    getCheckField() {
       let customColumns = this.$refs.multipleTemplateTable.customColumns || []
       let customColumnSetting = JSON.parse(
         localStorage.getItem('customColumnSetting') || '{}'
@@ -4622,9 +4622,12 @@ export default {
       const checkField = JSON.parse(
         decode(customColumnSetting[customColumnsHashCode]) || '[]'
       )
-      return checkField.filter(
-        (field) => field.checked && ['序号', '操作'].indexOf(field.value) == -1
-      )
+      return checkField.length
+        ? checkField.filter(
+            (field) =>
+              field.checked && ['序号', '操作'].indexOf(field.value) == -1
+          )
+        : customColumns
     },
   },
   // asyncComputed: {