free-fe-core-modules 0.1.15 → 0.1.17

package/components/Basic/SummaryHead.vue

@@ -143,9 +143,9 @@ export default defineComponent({
         item.disable = false;
         if (item.event) {
           if (item.event_params) {
-            this.Bus?.$emit(item.event, item.event_params);
+            this.Bus?.emit(item.event, item.event_params);
           } else {
-            this.Bus?.$emit(item.event);
+            this.Bus?.emit(item.event);
           }
         }
 

package/components/Dialog/BasicDialog.vue

@@ -150,7 +150,9 @@ export default defineComponent({
     fieldsClass: { type: String, default: '' },
     dialogClass: { type: String, default: '' },
 
-    remove: { type: Function, default: () => {}}
+    remove: { type: Function, default: () => {}},
+
+    noRejectOnCancel: { type: Boolean, default: false },
   },
   components: {
     FreeField,
@@ -242,12 +244,16 @@ export default defineComponent({
       }
 
       if (reject.value) {
-        reject.value('cancel');
-
-        if (typeof props.remove === 'function'){
-          props.remove();
+        if (!props.noRejectOnCancel) {
+          reject.value('cancel');
+        } else {
+          emit('ok');
         }
       }
+
+      if (typeof props.remove === 'function'){
+        props.remove();
+      }
     };
 
     const btn_ok = () => {

package/free-field/Fields/QueryFilters.vue

@@ -27,11 +27,19 @@
 
       <q-space v-if="!hasKw || dense"></q-space>
       <div class="q-ma-xs query-btns" v-if="!hasKw || dense">
+        <q-btn
+          v-if="Field.canExport"
+          class="export-btn"
+          icon="fa fa-list"
+          label="导出"
+          @click="$emit('export')"
+        />
         <q-btn class="clear-btn" icon="refresh" label="清空" @click="clear"></q-btn>
         <q-btn class="query-btn q-ma-xs" icon="search" label="查询" @click="search"></q-btn>
       </div>
     </div>
-    <div class="row col items-center full-width" v-if="hasKw && !dense">
+    <div class="row col items-center full-width"
+      v-if="hasKw && !dense">
       <free-field
         :Field="{
           Type: 'String',
@@ -88,7 +96,7 @@ export default defineComponent({
     const kwFields = ref([]);
 
     watchEffect(()  => {
-      query.value = props.Field.queryData;
+      query.value = props.Field.queryData || {};
     })
 
     watchEffect(() => {
@@ -100,7 +108,7 @@ export default defineComponent({
         ) {
           if (!fd.Info || !fd.Info.Separate) {
             hasKw.value = true;
-            if (fd.Label) {
+            if (fd.Label && !kwFields.value.includes(fd.Label)) {
               kwFields.value.push(fd.Label);
             }
           }
@@ -146,7 +154,6 @@ export default defineComponent({
       return fList;
     });
 
-
     const search = () => {
       if (queryChanged.value) {
         emit('search', query.value);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-fe-core-modules",
-  "version": "0.1.15",
+  "version": "0.1.17",
   "main": "index.js",
   "repository": "https://github.com/freeeis/free-fe-core-modules.git",
   "author": "zhiquan",