free-fe-core-modules 0.0.1 → 0.0.2

package/components/Basic/SummaryHead.vue

@@ -85,7 +85,6 @@ export default defineComponent({
     has_multiple_head: { type: Boolean, default: false },
   },
   created() {
-    this.Bus?.$on('update_summary_head', this.refreshData);
   },
   methods: {
     filteredValue(item) {
@@ -137,7 +136,6 @@ export default defineComponent({
     },
   },
   beforeUnmount() {
-    this.Bus?.$off('update_summary_head', this.refreshData);
   },
 });
 </script>

package/components/Dialog/BasicDialog.vue

@@ -6,7 +6,7 @@
     <q-card
       :class="['basic-dialog-card', dialogClass]"
       :style="`min-height: ${size.h}px;
-         width: ${size.w}px; min-width: ${size.w}`"
+        width: ${size.w}px; min-width: ${size.w}`"
     >
       <q-btn
         class="float-right close-dialog-button"
@@ -32,10 +32,6 @@
           v-if="tips"
           class="tips"
         >{{ tips }}</div>
-        <!-- <div
-          v-if="warning"
-          class="warning"
-        >{{ warning }}</div> -->
         <div
           v-if="warning"
           class="warning no-wrap"
@@ -106,6 +102,8 @@
 <script>
 import mixins from 'free-fe-mixins';
 import { defineComponent } from 'vue';
+import FreeField from '../../field-components/components/FieldComponents.vue';
+import EIcon from '../Basic/EIcon.vue';
 
 export default defineComponent({
   name: 'BasicDialog',
@@ -149,6 +147,12 @@ export default defineComponent({
     fieldsData: { type: Object, default: () => ({}) },
     fieldsClass: { type: String, default: '' },
     dialogClass: { type: String, default: '' },
+
+    remove: { type: Function, default: () => {}}
+  },
+  components: {
+    FreeField,
+    EIcon,
   },
   data() {
     return {
@@ -161,13 +165,6 @@ export default defineComponent({
       reject: '',
     };
   },
-  // created() {
-  //   if (this.visible) {
-  //     this.show();
-  //   } else {
-  //     this.hide();
-  //   }
-  // },
   watch: {
     visible() {
       if (this.visible) {
@@ -200,7 +197,7 @@ export default defineComponent({
     // following method is REQUIRED
     // (don't change its name --> "show")
     show() {
-      debugger
+      // debugger
       this.$refs.dialog.show();
       this.timeout_counter();
 
@@ -257,15 +254,6 @@ export default defineComponent({
         this.remove();
       }
     },
-    // show_msg_box() {
-    //   this.show();
-    //   this.promise = new Promise((resolve, reject) => {
-    //     this.resolve = resolve;
-    //     this.reject = reject;
-    //   });
-
-    //   return this.promise;
-    // },
     btnCancel() {
       this.$emit('cancel');
 
@@ -280,12 +268,6 @@ export default defineComponent({
       }
     },
     btn_ok() {
-      // // validate
-      // if (this.validateFunc && typeof this.validateFunc === 'function') {
-      //   // now we only have such content, but later we might will have more
-      //   this.textValid = this.validateFunc(this.textContent);
-      //   if (!this.textValid) return;
-      // }
       if (!this.validate()) {
         return;
       }
@@ -322,10 +304,6 @@ export default defineComponent({
         }
       }, 1000);
     },
-    remove() {
-      this.$destroy();
-      document.body.removeChild(this.$el);
-    },
     onInputFieldInput(field){
       if(field.onInput) {
         field.onInput(field);
@@ -394,49 +372,4 @@ export default defineComponent({
   text-align: center;
   color: red;
 }
-
-// .admin {
-//   margin-top: 10px;
-//   text-align: center;
-//   color: red;
-//   font-size: 12px;
-// }
-
-// .cancel-btn {
-//   background: rgba(255, 255, 255, 1);
-//   border: 1px solid rgba(74, 74, 74, 1);
-//   color: rgba(74, 74, 74, 1);
-// }
-
-// .cancel-btn:hover {
-//   background: rgba(0, 69, 156, 1);
-//   color: rgba(255, 255, 255, 1);
-//   border: 0;
-// }
-
-// .disabled-cancel-btn {
-//   background: rgba(255, 255, 255, 1);
-//   border: 1px solid rgba(155, 155, 155, 1);
-//   color: rgba(155, 155, 155, 1);
-// }
-
-// .ok-btn {
-//   background: rgba(24, 115, 220, 1);
-//   color: rgba(255, 255, 255, 1);
-// }
-
-// .ok-btn:hover {
-//   background: rgba(0, 69, 156, 1);
-//   color: rgba(255, 255, 255, 1);
-// }
-
-// .disabled-ok-btn {
-//   background: rgba(155, 155, 155, 1);
-//   color: rgba(255, 255, 255, 1);
-// }
-
-// .disabled-ok-btn:hover {
-//   background: rgba(155, 155, 155, 1);
-//   color: rgba(255, 255, 255, 1);
-// }
 </style>

package/components/Dialog/index.js

@@ -1,38 +1,48 @@
-import { createApp } from 'vue'
-import BasicDialog from './BasicDialog.vue';
-
-let $inst
-// 创建挂载实例
-let createMount = (opts) => {
-  const app = createApp(BasicDialog, {
-    ...opts, modelValue: true,
-    remove () {
-      app.unmount(mountNode)
-      document.body.removeChild(mountNode)
-    }
-  })
-  return app.mount('#eis-dialog')
-}
-
-function MsgDialog (options = {}) {
-  if (typeof options === 'string') {
-    options = {content: options};
-  }
-
-  $inst = createMount(options)
-
-  return $inst.show()
-    .then((val) => {
-      return Promise.resolve(val);
-    })
-    .catch((err) => {
-      return Promise.reject(err);
-    });
-}
+import { createApp } from 'vue';
+import Dialog from './BasicDialog.vue'
 
+const MsgDialog = {};
 MsgDialog.install = (app) => {
-  app.config.globalProperties.$MsgDialog = MsgDialog;
-  // app.provide('MsgDialog', MsgDialog)
-}
+  let MsgDialogInstance;
+  const init = (opts) => {
+    const dialogApp = createApp(Dialog, {
+      ...opts, modelValue: true,
+      remove: () => {
+        dialogApp.unmount();
+      }
+    });
+
+    dialogApp.config.globalProperties = app.config.globalProperties;
+
+    const { reload, ...appContext } = app._context;
+    Object.assign(dialogApp._context, appContext);
+
+    MsgDialogInstance = dialogApp.mount('#free-dialog');
+  };
+
+  app.config.globalProperties.$MsgDialog = (options) => {
+    const opts = {};
+
+    if (typeof options === 'string') {
+      opts.content = options;
+    } else if (typeof options === 'object') {
+      Object.assign(opts, options);
+    }
+
+    if (!MsgDialogInstance) {
+      init(opts);
+    }
+
+    return MsgDialogInstance.show()
+      .then((val) => {
+        MsgDialogInstance = null;
+        return Promise.resolve(val);
+      })
+      .catch((err) => {
+        MsgDialogInstance = null;
+        return Promise.reject(err);
+      });
+  };
+};
 
 export default MsgDialog;

package/components/Dialog/index2.js

@@ -0,0 +1,44 @@
+import { createApp } from 'vue';
+import dialog from './BasicDialog.vue';
+
+// 创建挂载实例
+let createMount = (opts) => {
+  const app = createApp(dialog, {
+    ...opts, modelValue: true,
+    // remove () {
+    //   app.unmount(mountNode)
+    //   document.body.removeChild(mountNode)
+    // }
+  })
+
+  return app.mount('#free-dialog')
+}
+
+function MsgDialog (options = {}) {
+  if (typeof options === 'string') {
+    options = {content: options};
+  }
+
+  const $inst = createMount(options)
+
+  console.error($inst)
+  if (!$inst) {
+    console.error($inst)
+    return;
+  }
+
+  return $inst.show()
+    .then((val) => {
+      return Promise.resolve(val);
+    })
+    .catch((err) => {
+      return Promise.reject(err);
+    });
+}
+
+MsgDialog.install = (app) => {
+  app.config.globalProperties.$MsgDialog = MsgDialog;
+  // app.provide('MsgDialog', MsgDialog)
+}
+
+export default MsgDialog;

package/components/SelectLocales/index.vue

@@ -8,6 +8,7 @@
           clickable
           v-close-popup
           @click="localeChanged(locale.locale)"
+            :active="$i18n.locale === locale.locale"
         >
           <q-item-section>{{locale.name}}</q-item-section>
         </q-item>
@@ -30,10 +31,8 @@ export default defineComponent({
     },
   },
   created() {
-    // set the default locale
-    // if (this.locales && this.locales.length > 0) {
-    //   this.$i18n.locale = this.locales[0].locale;
-    // }
+    const appStore = useAppStore();
+    this.$i18n.locale = appStore.locale || (this.locales && (this.locales.length > 0) && this.locales[0]);
   },
   methods: {
     localeChanged(l){

package/components/StickyButtons/index.vue

@@ -47,7 +47,7 @@ export default defineComponent({
   emits: ['click'],
   props: {
     position: { type: String, default: 'bottom-right' },
-    offset: { type: Array, default: () => [36, 128, 0, 0] },
+    offset: { type: Array, default: () => [36, 128] },
     fab: { type: Boolean, default: true },
     fabIcon: { type: String, default: 'add' },
     fabColor: { type: String, default: '' },
@@ -58,7 +58,7 @@ export default defineComponent({
   },
   data() {
     return {
-      stickyOffset: [36, 128, 0, 0],
+      stickyOffset: [36, 128],
       draggingSticky: false,
     };
   },

package/components/ThemeSwitch/index.vue

@@ -14,6 +14,7 @@
             clickable
             v-close-popup
             @click="theme = tm"
+            :active="theme === tm"
           >
             <q-item-section>{{$t(tm)}}</q-item-section>
           </q-item>
@@ -25,6 +26,7 @@
 
 <script>
 import { defineComponent } from 'vue';
+import useAppStore from '@/stores/app';
 
 export default defineComponent({
   name: 'ThemeSwitch',
@@ -65,13 +67,15 @@ export default defineComponent({
         arr.push(`theme-${v}`);
 
         appEle.className = arr.join(' ');
+
+        const appStore = useAppStore();
+        appStore.SET_THEME(v);
       }
     },
   },
   created() {
-    if (this.themes && this.themes.length > 0) {
-      this.theme = this.themes[0];
-    }
+    const appStore = useAppStore();
+    this.theme = appStore.theme || (this.themes && (this.themes.length > 0) && this.themes[0]);
   },
 });
 </script>

package/field-components/Fields/File.vue

@@ -45,7 +45,7 @@
             <a
               class="ellipsis"
               target="_blank"
-              :href="runFilter('serverPath',file.id)"
+              :href="$filter('serverPath',file.id)"
               :download="file.name"
             >
               {{ file.name }}
@@ -135,7 +135,7 @@
                 <a
                   v-if="file && file.id"
                   target="_blank"
-                  :href="runFilter('serverPath',file.id)"
+                  :href="$filter('serverPath',file.id)"
                   :download="file.name">
                     {{ file.name }}
                 </a>

package/field-components/Fields/FileList.vue

@@ -46,7 +46,7 @@
             <a
               class="ellipsis"
               target="_blank"
-              :href="runFilter('serverPath',file.id)"
+              :href="$filter('serverPath',file.id)"
               :download="file.name"
             >
               {{ file.name }}
@@ -109,7 +109,7 @@
                 <span class="file-name full-width ellipsis">
                   <a
                     target="_blank"
-                    :href="runFilter('serverPath',file.id)"
+                    :href="$filter('serverPath',file.id)"
                     :download="file.name">
                       {{ file.name }}
                   </a>
@@ -160,7 +160,7 @@
               <span class="file-name full-width ellipsis">
                 <a
                   target="_blank"
-                  :href="runFilter('serverPath',file.id)"
+                  :href="$filter('serverPath',file.id)"
                   :download="file.name">
                     {{ file.name }}
                 </a>

package/field-components/Fields/FileListCombined.vue

@@ -30,7 +30,7 @@
               <span class="file-name full-width ellipsis">
                 <a
                   target="_blank"
-                  :href="runFilter('serverPath',file.id)"
+                  :href="$filter('serverPath',file.id)"
                   :download="file.name">
                     {{ file.name }}
                 </a>
@@ -71,7 +71,7 @@
             <span class="file-name full-width ellipsis">
               <a
                 target="_blank"
-                :href="runFilter('serverPath',file.id)"
+                :href="$filter('serverPath',file.id)"
                 :download="file.name">
                   {{ file.name }}
               </a>

package/field-components/Fields/Image.vue

@@ -68,7 +68,7 @@
         </q-btn>
         <q-img
           v-if="onlyIcon && scope.files.length > 0"
-          :src="runFilter('serverThumb',`${scope.files[0].id}`)"
+          :src="$filter('serverThumb',`${scope.files[0].id}`)"
           style="width: 32px; max-height: 32px;"
         >
           <q-uploader-add-trigger/>
@@ -125,7 +125,7 @@
                 <a
                   v-if="file && file.id"
                   target="_blank"
-                  :href="runFilter('serverPath',file.id)"
+                  :href="$filter('serverPath',file.id)"
                   :download="file.name">
                     {{ file.name }}
                 </a>

package/field-components/Fields/Select.vue

@@ -78,7 +78,6 @@
         </template>
 
         <template v-slot:option="scope">
-          {{scope.itemProps}}
           <q-item
             v-bind="scope.itemProps"
           >

package/index.js

@@ -13,21 +13,12 @@ import LeveledMenus from './components/Basic/LeveledMenus.vue';
 import BreadCrumbs from './components/Basic/BreadCrumbs.vue';
 import ThemeSwitch from './components/ThemeSwitch/index.vue';
 
+import Mourning from './view/mourning/mourning.vue';
+
 import FieldComponents from './field-components';
 import FreeFields from './free-fields';
 import routers from './router';
 
-// Vue.component('EIcon', () => import('./components/Basic/EIcon.vue'));
-// Vue.component('StickyButtons', () => import('./components/StickyButtons'));
-// Vue.component('SelectLocales', () => import('./components/SelectLocales'));
-// Vue.component('SummaryHead', () => import('./components/Basic/SummaryHead.vue'));
-// Vue.component('SlidingCarousel', () => import('./components/SlidingCarousel/index.vue'));
-// Vue.component('SlidingNews', () => import('./components/SlidingNews/index.vue'));
-// Vue.component('FloatingWindow', () => import('./components/FloatingWindow/index.vue'));
-// Vue.component('LeveledMenus', () => import('./components/Basic/LeveledMenus.vue'));
-// Vue.component('BreadCrumbs', () => import('./components/Basic/BreadCrumbs.vue'));
-// Vue.component('ThemeSwitch', () => import('./components/ThemeSwitch/index.vue'));
-
 // global filters
 const filters = {
   serverImage: url => (url ? `${config.imageUrlBase}${url}` : ''),
@@ -144,14 +135,8 @@ const filters = {
   },
 };
 
-// export default {
-//   config: {},
-//   routers: [],
-//   filters,
-//   components
-// }
-
 export default (app, root) => {
+  console.error('register dialog')
   root.use(MsgDialog);
 
   return {
@@ -294,7 +279,7 @@ export default (app, root) => {
       ThemeSwitch,
       ...FieldComponents.components,
       ...FreeFields,
-      mourning: () => import("./view/mourning/mourning.vue"),
+      Mourning,
     },
     fieldComponents: FieldComponents.fieldComponents,
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "free-fe-core-modules",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "main": "index.js",
   "repository": "git@gitlab.com:eis-base/modules/free-fe-core-modules.git",
   "author": "zhiquan",

package/view/dict/index.vue

@@ -271,13 +271,11 @@ export default defineComponent({
 
 <style lang="sass" scoped>
 .admin-dictionary-mgmt-wrapper
-  background: $background
   .dictionary-head
     .description
       max-width: 680px
       font-size: 12px
       font-weight: 400
-      color: $grey-7
     .dictionary-data-name
       font-size: 14px
       font-weight: normal

package/view/menu/index.vue

@@ -325,8 +325,3 @@ export default defineComponent({
   },
 });
 </script>
-
-<style lang="sass" scoped>
-.admin-menu-mgmt-wrapper
-  background: $background
-</style>

package/components/Dialog/index1.js

@@ -1,49 +0,0 @@
-import {createApp} from 'vue';
-import BasicDialog from './BasicDialog.vue';
-
-let _i18n = null;
-
-export function setI18n (i18n) {
-  _i18n = i18n
-}
-
-const MsgDialog = {};
-MsgDialog.install = (app) => {
-  // const MessageDialogInstance = app.extend(BasicDialog);
-  // const MessageDialogInstance = createApp(BasicDialog);
-
-  let MsgDialogInstance;
-  const init = () => {
-    // app.config.globalProperties._i18n = _i18n;
-
-    // MsgDialogInstance = new MessageDialogInstance();
-    MsgDialogInstance = createApp(BasicDialog);
-    MsgDialogInstance = MsgDialogInstance.mount('#eis-dialog');
-    // document.body.appendChild(msgBoxEl);
-  };
-
-  app.config.globalProperties.$MsgDialog = (options) => {
-    if (!MsgDialogInstance) {
-      init();
-    }
-
-    if (typeof options === 'string') {
-      MsgDialogInstance.content = options;
-    } else if (typeof options === 'object') {
-      Object.assign(MsgDialogInstance.$props, options);
-    }
-
-    // return MsgDialogInstance.show_msg_box()
-    return MsgDialogInstance.show()
-      .then((val) => {
-        MsgDialogInstance = null;
-        return Promise.resolve(val);
-      })
-      .catch((err) => {
-        MsgDialogInstance = null;
-        return Promise.reject(err);
-      });
-  };
-};
-
-export default MsgDialog;