free-fe-core-modules 0.0.50 → 0.0.52

package/components/ThemeSwitch/index.vue

@@ -18,7 +18,7 @@
             :key="index"
             clickable
             v-close-popup
-            @click="theme = tm"
+            @click="setTheme(tm)"
             :active="theme === tm"
           >
             <q-item-section>{{$t(tm)}}</q-item-section>
@@ -39,6 +39,7 @@ export default defineComponent({
     icon: { type: String, default: 'fas fa-palette' },
     dense: { type: Boolean, default: true },
     hide: { type: Boolean, default: false },
+    reload: { type: Boolean, default: false },
   },
   data() {
     return {
@@ -102,6 +103,17 @@ export default defineComponent({
     const appStore = useAppStore();
     this.theme = appStore.theme || this.ctx.config.defaultTheme || (this.themes && (this.themes.length > 0) && this.themes[0]);
   },
+  methods: {
+    setTheme(tm) {
+      if (!tm || this.theme === tm) return;
+
+      this.theme = tm;
+
+      if (this.reload) {
+        window.location.reload();
+      }
+    },
+  },
 });
 </script>
 

package/free-field/Fields/Number.js

@@ -157,7 +157,7 @@ export default defineComponent({
 
     const inputNode = computed(() => h(QInput, {
       type: mask.value ? 'text' : 'number',
-      mask,
+      mask: mask.value,
       maxlength: props.Field.Options?.MaxLength,
       autocomplete: 'off',
       // bottomSlots: true,

package/free-field/Fields/Select.vue

@@ -166,10 +166,10 @@
               {{$t(option.opt.Tooltip) || ''}}
             </q-tooltip>
             <div class="option-inner-extra" v-if="option.InnerExtra?.length">
-              <input-field
+              <free-field
                 v-for="(fld, idx) in option.InnerExtra || []" :key="idx"
                 :Field="fld"
-                :values="data"></input-field>
+                :values="data"></free-field>
             </div>
           </q-checkbox>
         </div>

package/free-field/Fields/Tabs.vue

@@ -164,7 +164,7 @@ export default defineComponent({
     }
   }
 
-  .input-field-tabs-panel-field-empty {
+  .free-field-tabs-panel-field-empty {
     display: none;
   }
 }

package/free-field/Fields/pdfviewer.js

@@ -1,3 +1,6 @@
+import { h, getCurrentInstance, } from 'vue';
+import { useQuasar } from 'quasar';
+
 import { useModelToggleProps, useModelToggleEmits } from 'quasar/src/composables/private.use-model-toggle/use-model-toggle.js';
 
 export default {
@@ -39,6 +42,32 @@ export default {
       this.height = event.data;
     });
   },
+  setup(props) {
+    const { proxy:vm } = getCurrentInstance();
+    const $q = useQuasar();
+
+    return () => {
+      if (props.src !== undefined && props.src.length > 0) {
+        return h(
+          'div',
+          {
+            staticClass: 'q-pdfviewer',
+            class: props.contentClass,
+            style: props.contentStyle,
+          },
+          [
+            ($q.platform.is.electron || props.type === 'pdfjs')
+              // eslint-disable-next-line no-underscore-dangle
+              ? vm.__renderIFramePDFJS(h)
+              // eslint-disable-next-line no-underscore-dangle
+              : vm.__renderObject(h),
+          ],
+        );
+      }
+
+      return ''
+    };
+  },
   methods: {
     // eslint-disable-next-line no-underscore-dangle
     __renderObject(h) {
@@ -72,11 +101,9 @@ export default {
         'iframe',
         {
           staticClass: 'q-pdfviewer__iframe',
-          attrs: {
-            src: this.src,
-            width: '100%',
-            height: '100%',
-          },
+          src: this.src,
+          width: '100%',
+          height: '100%',
         },
       );
     },
@@ -87,36 +114,11 @@ export default {
         'iframe',
         {
           staticClass: 'q-pdfviewer__iframe',
-          attrs: {
-            src: `pdfjs${this.version ? `_${this.version}` : ''}/web/viewer.html?file=${encodeURIComponent(this.src)}`,
-            width: '100%',
-            height: '100%',
-          },
+          src: `pdfjs${this.version ? `_${this.version}` : ''}/web/viewer.html?file=${encodeURIComponent(this.src)}`,
+          width: '100%',
+          height: '100%',
         },
       );
     },
   },
-
-  render(h) {
-    if (this.value === true && this.src !== undefined && this.src.length > 0) {
-      return h(
-        'div',
-        {
-          staticClass: 'q-pdfviewer',
-          class: this.contentClass,
-          style: this.contentStyle,
-          attrs: {
-          },
-        },
-        [
-          this.$q.platform.is.electron || this.type === 'pdfjs'
-            // eslint-disable-next-line no-underscore-dangle
-            ? this.__renderIFramePDFJS(h)
-            // eslint-disable-next-line no-underscore-dangle
-            : this.__renderObject(h),
-        ],
-      );
-    }
-    return '';
-  },
 };

package/package.json

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