free-fe-core-modules 0.0.7 → 0.0.9

package/README.md

@@ -1,5 +1,5 @@
 <p align="center">
-  <a href="https://freeeis.aslancer.com" target="_blank">
+  <a href="https://www.freeeis.com" target="_blank">
     <img
       src="https://user-images.githubusercontent.com/33030594/227073920-03ed137f-c4f7-4ed7-ae05-d781dd1991f7.png"
       alt="FreeEIS"
@@ -22,7 +22,7 @@
 
 简体中文 | [English](https://github.com/freeeis/.github/blob/main/profile/README.en-us.md)
 
-[更多文档](https://freeeis.aslancer.com)（完善中……）
+[更多文档](https://www.freeeis.com)（完善中……）
 
 FreeEIS，是一种可扩展的、企业级系统统一开发框架。FreeEIS旨在解决越来越流行的远程协作开发中，系统拆分及组装的问题。并且通过积累越来越多的功能模块，使得系统的搭建更快捷。
 

package/components/Basic/SummaryHead.vue

@@ -123,12 +123,7 @@ export default defineComponent({
         for (let j = 0; j < filters.length; j += 1) {
           const f = filters[j];
 
-          const filterFunc = this.$options.filters[f];
-          if (filterFunc) {
-            item.number = filterFunc(
-              item.number,
-            );
-          }
+          item.number = this.$filter(f, item.number);
         }
 
         // remove the filter to avoid filter multiple times

package/components/Dialog/BasicDialog.vue

@@ -102,7 +102,7 @@
 </template>
 
 <script>
-import { defineComponent } from 'vue';
+import { defineComponent, ref, computed } from 'vue';
 import { useFormValidator } from '../../composible/useFormValidator';
 import FreeField from '../../free-field/composible/fieldWrapper';
 import EIcon from '../Basic/EIcon.vue';
@@ -157,168 +157,180 @@ export default defineComponent({
     FreeField,
     EIcon,
   },
-  setup(props, { expose }) {
+  setup(props, { expose, emit }) {
     const { validate } = useFormValidator('fieldsToValid');
-    expose({
-      validate,
-    })
 
-    return {};
-  },
-  data() {
-    return {
-      timeLeft: 0,
-      textContent: '',
-      textValid: true,
-      timer: undefined,
-      promise: '',
-      resolve: '',
-      reject: '',
-    };
-  },
-  watch: {
-    visible() {
-      if (this.visible) {
-        this.timeout_counter();
-        this.show();
-      } else {
-        this.hide();
-      }
-    },
-  },
-  computed: {
-    disabled() {
-      if (typeof this.okDisabled === 'object') {
-        return this.okDisabled.value;
-      }
+    const dialog  = ref(null);
 
-      return this.okDisabled;
-    },
-    warningMsg() {
-      // 设置默认warning
-      if (!this.showWarning) return '';
+    const timeLeft = ref(0),
+      textContent = ref(''),
+      textValid = ref(true),
+      timer = ref(undefined),
+      promise = ref(null),
+      resolve = ref(null),
+      reject = ref(null);
 
-      if (!this.warning) {
-        return '';
+    const timeout_counter = () => {
+      if (!props.timeout) {
+        return;
       }
-      return this.warning;
-    },
-  },
-  methods: {
-    // following method is REQUIRED
-    // (don't change its name --> "show")
-    show() {
-      this.$refs.dialog.show();
-      this.timeout_counter();
-
-      this.promise = new Promise((resolve, reject) => {
-        this.resolve = resolve;
-        this.reject = reject;
+
+      timeLeft.value = props.timeout;
+      timer.value = setInterval(() => {
+        timeLeft.value -= 1;
+        if (timeLeft.value < 1) {
+          clearInterval(timer.value);
+          btn_ok();
+        }
+      }, 1000);
+    };
+
+    const show = () => {
+      dialog.value.show();
+      timeout_counter();
+
+      promise.value = new Promise((resv, rej) => {
+        resolve.value = resv;
+        reject.value = rej;
       });
 
-      return this.promise;
-    },
+      return promise.value;
+    };
 
-    // following method is REQUIRED
-    // (don't change its name --> "hide")
-    hide() {
-      this.$refs.dialog.hide();
-    },
-    onDialogHide() {
-      // required to be emitted
-      // when QDialog emits "hide" event
-      this.$emit('hide');
-    },
-    onOKClick() {
-      // on OK, it is REQUIRED to
-      // emit "ok" event (with optional payload)
-      // before hiding the QDialog
-      // this.$emit('ok');
-      // or with payload: this.$emit('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()) {
+    const hide = () => {
+      dialog.value.hide();
+    };
+
+    const onDialogHide = () => {
+      emit('hide');
+    };
+
+    const onOKClick = () => {
+      if (!props.canOK || !validate.value()) {
         return;
       }
 
-      this.$emit('ok');
+      emit('ok');
 
-      if (this.timer) {
-        this.timeLeft = 0;
-        clearInterval(this.timer);
+      if (timer.value) {
+        timeLeft.value = 0;
+        clearInterval(timer.value);
       }
 
-      if (this.resolve) {
-        if (this.needText) {
-          this.resolve(this.textContent);
+      if (resolve.value) {
+        if (props.needText) {
+          resolve.value(textContent.value);
         } else {
-          this.resolve('confirm');
+          resolve.value('confirm');
         }
 
-        this.hide();
-        this.remove();
+        hide();
+
+        if (typeof props.remove === 'function'){
+          props.remove();
+        }
       }
-    },
-    btnCancel() {
-      this.$emit('cancel');
+    };
+
+    const btnCancel = () => {
+      if (!props.canCancel) return;
+
+      emit('cancel');
 
-      if (this.timer) {
-        this.timeLeft = 0;
-        clearInterval(this.timer);
+      if (timer.value) {
+        timeLeft.value = 0;
+        clearInterval(timer.value);
       }
 
-      if (this.reject) {
-        this.reject('cancel');
-        this.remove();
+      if (reject.value) {
+        reject.value('cancel');
+
+        if (typeof props.remove === 'function'){
+          props.remove();
+        }
       }
-    },
-    btn_ok() {
-      if (!this.validate()) {
+    };
+
+    const btn_ok = () => {
+      if (!validate.value()) {
         return;
       }
 
-      this.$emit('ok');
+      emit('ok');
 
-      if (this.timer) {
-        this.timeLeft = 0;
-        clearInterval(this.timer);
+      if (timer.value) {
+        timeLeft.value = 0;
+        clearInterval(timer.value);
       }
 
-      if (this.resolve) {
-        if (this.needText) {
-          this.resolve(this.textContent);
+      if (resolve.value) {
+        if (props.needText) {
+          resolve.value(textContent.value);
         } else {
-          this.resolve('confirm');
+          resolve.value('confirm');
         }
 
-        this.hide();
-        this.remove();
+        hide();
+
+        if (typeof props.remove === 'function'){
+          props.remove();
+        }
       }
-    },
-    timeout_counter() {
-      if (!this.timeout) {
-        return;
+    };
+
+    expose({
+      validate,
+      show,
+      hide,
+    });
+
+    watch(() => props.visible, (v) => {
+      if (v) {
+        timeout_counter();
+        show();
+      } else {
+        hide();
       }
+    });
 
-      this.timeLeft = this.timeout;
-      this.timer = setInterval(() => {
-        this.timeLeft -= 1;
-        if (this.timeLeft < 1) {
-          clearInterval(this.timer);
-          this.btn_ok();
-        }
-      }, 1000);
-    },
-    onInputFieldInput(field){
-      if(field.onInput) {
-        field.onInput(field);
+
+    const disabled = computed(() => {
+      if (typeof props.okDisabled === 'object') {
+        return props.okDisabled.value;
       }
-    }
+
+      return props.okDisabled;
+    });
+
+    const warningMsg = computed(() => {
+      // 设置默认warning
+      if (!props.showWarning) return '';
+
+      if (!props.warning) {
+        return '';
+      }
+      return props.warning;
+    });
+
+    return {
+      dialog,
+      timeLeft,
+      textContent,
+      textValid,
+
+      disabled,
+      warningMsg,
+
+      validate,
+
+      show,
+      hide,
+      onDialogHide,
+      onOKClick,
+      btnCancel,
+      btn_ok,
+      timeout_counter,
+    };
   },
 });
 </script>

package/components/SlidingNews/index.vue

@@ -37,7 +37,7 @@
           <q-space />
           <div class="sliding-news-right"
             :style="`line-height: ${heightString}`">
-              {{filter('normalDate',(carouse.PublishDate || carouse.LastUpdateDate))}}
+              {{$filter('normalDate',(carouse.PublishDate || carouse.LastUpdateDate))}}
           </div>
         </div>
       </q-carousel-slide>
@@ -105,7 +105,6 @@ export default defineComponent({
     return {
       visible: true,
       slide: 0,
-      timer: undefined,
     };
   },
   computed: {
@@ -119,18 +118,18 @@ export default defineComponent({
 
       return this.height;
     },
-  },
-  localData() {
-    const fks = Object.keys(this.fields || {});
-    return (this.data || []).map((dd) => {
-      const ret = {};
-      for (let i = 0; i < fks.length; i += 1) {
-        const fk = fks[i];
-        ret[fk] = dd[this.fields[fk]];
-      }
+    localData() {
+      const fks = Object.keys(this.fields || {});
+      return (this.data || []).map((dd) => {
+        const ret = {};
+        for (let i = 0; i < fks.length; i += 1) {
+          const fk = fks[i];
+          ret[fk] = dd[this.fields[fk]];
+        }
 
-      return { ...dd, ...ret };
-    });
+        return { ...dd, ...ret };
+      });
+    },
   },
   methods: {
     newsClicked(news) {
@@ -142,16 +141,6 @@ export default defineComponent({
         this.router.push({ path: url });
       }
     },
-    // carouselNext() {
-    //   if (!this.data || this.data.length < 2 || !this.$refs.carousel) {
-    //     return;
-    //   }
-
-    //   this.$refs.carousel.next();
-    // },
   },
-  // beforeUnmount() {
-  //   clearInterval(this.timer);
-  // },
 });
 </script>

package/composible/useFormValidator.js

@@ -7,12 +7,12 @@ export function useFormValidator(...list) {
     validate: computed(() => {
       return (...args) => {
         if (vm.shouldHide) return true;
-      
+
         // could have customized validate function in component
         if (vm.selfValidate && typeof vm.selfValidate === 'function') {
           return vm.selfValidate();
         }
-      
+
         const refsList = [];
         for(let i = 0; i < list.length; i += 1) {
           if (typeof list[i] === 'string') {
@@ -20,24 +20,25 @@ export function useFormValidator(...list) {
           } else if (typeof list[i] === 'function') {
             list[i] = list[i]();
           }
-          
+
           if (Array.isArray(list[i])) {
             refsList.push(...list[i])
           } else {
             refsList.push(list[i])
           }
         }
-  
+
         if (refsList.length <= 0) return true;
-      
+
         let hasErr = false;
         for (let i = 0; i < refsList.length; i += 1) {
           let refi = unref(refsList[i]);
 
+          if (!refi) continue;
 
           const validFun = unref(refi.validate || refi.methods?.validate || refi.component?.exposed?.validate|| refi.component?.ctx?.validate);
           const shouldHide = unref(refi.shouldHide || refi.component?.ctx?.shouldHide);
-      
+
           if (typeof validFun === 'function' && shouldHide !== true) {
             hasErr = !validFun() || hasErr;
 
@@ -47,7 +48,7 @@ export function useFormValidator(...list) {
             }
           }
         }
-      
+
         return !hasErr;
       };
     }),

package/composible/useObjectData.js

@@ -44,12 +44,12 @@ export function useObjectData(props, ctx) {
 
       if (typeof getData === 'function') {
         Promise.resolve(getData(...args)).then((d) => {
-          Object.assign(data.value, d);
+          Object.assign(data.value, d.value ||  d);
         }).finally(() => {
           callsLeft.value --;
         });
       } else {
-        Object.assign(data.value, getData);
+        Object.assign(data.value, getData.value || getData);
         callsLeft.value --;
       }
     }

package/free-field/Fields/ApiCall.js

@@ -1,5 +1,5 @@
 import { defineComponent, getCurrentInstance, h, ref, watchEffect } from 'vue';
-import { useFreeField, freeFieldProps, useFreeFieldMethods } from '../composible/useFreeField';
+import { useFreeField, freeFieldProps } from '../composible/useFreeField';
 import ReadonlyContent from '../composible/readonlyContent';
 
 export default defineComponent({
@@ -54,9 +54,6 @@ export default defineComponent({
   props: {
     ...freeFieldProps,
   },
-  methods: {
-    ...useFreeFieldMethods,
-  },
   setup(props, { slots }){
     if (!props.Field) return {};
 

package/free-field/Fields/Boolean.js

@@ -1,5 +1,5 @@
 import { defineComponent, h, ref } from 'vue';
-import { useFreeField, freeFieldProps, useFreeFieldMethods } from '../composible/useFreeField';
+import { useFreeField, freeFieldProps } from '../composible/useFreeField';
 import { QToggle } from 'quasar';
 import freeFieldLabel from '../composible/freeFieldLabel';
 
@@ -69,9 +69,6 @@ export default defineComponent({
     ...freeFieldProps,
   },
   emits: ['input'],
-  methods: {
-    ...useFreeFieldMethods,
-  },
   setup(props, { emit, slots }){
     if (!props.Field) return {};
 

package/free-field/Fields/Check.js

@@ -1,5 +1,5 @@
 import { defineComponent, h, ref } from 'vue';
-import { useFreeField, freeFieldProps, useFreeFieldMethods } from '../composible/useFreeField';
+import { useFreeField, freeFieldProps } from '../composible/useFreeField';
 import { QCheckbox } from 'quasar';
 import freeFieldLabel from '../composible/freeFieldLabel';
 
@@ -69,9 +69,6 @@ export default defineComponent({
     ...freeFieldProps,
   },
   emits: ['input'],
-  methods: {
-    ...useFreeFieldMethods,
-  },
   setup(props, { emit, slots }){
     if (!props.Field) return {};
 

package/free-field/Fields/Column.vue

@@ -0,0 +1,126 @@
+<template>
+  <div class="input-field-column column" :class="columnClasses">
+    <input-field
+      v-for="(field, idx) in Field.Options.List"
+      :Field="field"
+      :values="fieldData"
+      :key="idx"
+      @input="$emit('input')"></input-field>
+  </div>
+</template>
+
+<script>
+import { InputFieldMixin } from 'eis-admin-mixins';
+
+export default {
+  name: 'InputFieldColumn',
+  mixins: [InputFieldMixin],
+  fieldInfo: {
+    Category: 'Container',
+    Label: '列',
+    Value: 'Column',
+    Extra: [
+      {
+        Label: '不换行',
+        Name: 'Options.NoWrap',
+        Type: 'Bollean',
+      },
+      {
+        Label: '横向对齐',
+        Name: 'Options.ItemsAlign',
+        Type: 'Select',
+        Options: [
+          {
+            Label: '居上',
+            Value: 'items-start',
+          },
+          {
+            Label: '居中',
+            Value: 'items-center',
+          },
+          {
+            Label: '居下',
+            Value: 'items-end',
+          },
+        ],
+      },
+      {
+        Label: '竖向对齐',
+        Name: 'Options.JustifyAlign',
+        Type: 'Select',
+        Options: [
+          {
+            Label: '居左',
+            Value: 'justify-start',
+          },
+          {
+            Label: '居中',
+            Value: 'justify-center',
+          },
+          {
+            Label: '居右',
+            Value: 'justify-end',
+          },
+          {
+            Label: '围绕',
+            Value: 'justify-around',
+          },
+          {
+            Label: '之间',
+            Value: 'justify-between',
+          },
+          {
+            Label: '均匀',
+            Value: 'justify-evently',
+          },
+        ],
+      },
+      {
+        Label: '字段',
+        Name: 'Options.List',
+        Type: 'FieldList',
+        Options: {
+          Columns: [
+            {
+              Label: '#',
+              Name: 'Index',
+              sortable: true,
+            },
+            {
+              Label: '类型',
+              Name: 'Type',
+              style: 'max-width: 120px;',
+              sortable: true,
+            },
+            {
+              Label: '名称',
+              Name: 'Name',
+              style: 'max-width: 200px;',
+            },
+            {
+              Label: '默认',
+              Name: 'Default',
+              style: 'max-width: 200px;',
+            },
+            {
+              Label: '标题',
+              Name: 'Label',
+              style: 'max-width: 200px;',
+              sortable: true,
+            },
+          ],
+        },
+      },
+    ],
+    Description: '',
+  },
+  computed: {
+    columnClasses() {
+      return '';
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+</style>

package/free-field/Fields/Date.js

@@ -1,6 +1,6 @@
 import { ref, defineComponent, getCurrentInstance, h, computed } from 'vue';
 import { QInput, QIcon, QPopupProxy, QDate } from 'quasar';
-import { useFreeField, freeFieldProps, useFreeFieldMethods } from '../composible/useFreeField';
+import { useFreeField, freeFieldProps } from '../composible/useFreeField';
 import freeFieldLabel from '../composible/freeFieldLabel';
 import { useFormValidator} from '../../composible/useFormValidator';
 
@@ -38,9 +38,6 @@ export default defineComponent({
     ...freeFieldProps,
   },
   emits: ['input'],
-  methods: {
-    ...useFreeFieldMethods,
-  },
   setup(props, { emit, slots, expose }){
     if (!props.Field) return {};