free-fe-core-modules 0.0.55 → 0.1.2

package/free-field/Fields/Select.vue

@@ -1,107 +1,56 @@
 <template>
   <span :class="(Field && Field.AsCheck) ? 'free-field-select' :
     'free-field-select simple-field row'">
-    <span
-      v-if="!Field.AsCheck"
-      class="row no-wrap items-center full-width inline-block"
-    >
-      <span
-        v-if="Field.ReadOnly"
-        class="full-width"
-      >
-        <span
-          :class="`field-label field-label-readonly ${(Field.Label && Field.Label.trim().length)
-            ? '' : 'field-label-empty'} ${Field.Required ? 'required' : ''}`"
-          v-if="Field.Label !== void 0"
-        >
-          <q-tooltip
-            v-if="Field.Description"
-            anchor="top right"
-          >{{$t(Field.Description)}}</q-tooltip>
-          {{$t(Field.Label) || ''}}
-          <span
-            v-if="Field.Required"
-            class="required-mark"
-          >*</span>
+    <span v-if="!Field.AsCheck" class="row no-wrap items-center full-width inline-block">
+      <span v-if="Field.ReadOnly" class="full-width">
+        <span :class="`field-label field-label-readonly ${(Field.Label && Field.Label.trim().length)
+          ? '' : 'field-label-empty'} ${Field.Required ? 'required' : ''}`" v-if="Field.Label !== void 0">
+          <q-tooltip v-if="Field.Description" anchor="top right">{{ $t(Field.Description) }}</q-tooltip>
+          {{ $t(Field.Label) || '' }}
+          <span v-if="Field.Required" class="required-mark">*</span>
         </span>
         <span class="readonly-content">
-          <span
-            class="prefix"
-            v-if="Field.Info && Field.Info.Prefix"
-          >
-          {{Field.Info.Prefix}}
+          <span class="prefix" v-if="Field.Info && Field.Info.Prefix">
+            {{ Field.Info.Prefix }}
           </span>
           <div v-if="Field.Info && Field.Info.Chip">
             <q-chip v-bind="Field.Info.ChipOptions || {}" v-for="(opt, idx) in readonlyContent || []" :key="idx">
-              {{opt}}
+              {{ opt }}
             </q-chip>
           </div>
           <span v-else :style="(Field.Info && Field.Info.Style) ? Field.Info.Style : ''">
-            {{readonlyContent}}
+            {{ readonlyContent }}
           </span>
-          <span
-            class="postfix"
-            v-if="Field.Info && Field.Info.Postfix"
-          >{{Field.OptiInfons.Postfix}}</span>
+          <span class="postfix" v-if="Field.Info && Field.Info.Postfix">{{ Field.OptiInfons.Postfix }}</span>
         </span>
       </span>
 
-      <q-select
-        v-else
-        popup-content-class="free-field-select-control"
-        hide-bottom-space
-        :modelValue="fieldData.value"
-        @update:modelValue="selectChanged"
-        :options="localOptions"
-        option-value="Value"
-        option-label="Label"
-        map-options
-        emit-value
-        :label="Field.Placeholder || $t(getModule('core-modules').config['defaultSelectFieldPlaceholder'])"
-        :multiple="Field.Multiple"
-        :readonly="Field.ReadOnly"
-        ref="fieldToValid"
-        :use-input="Field && (Field.UseInput || (Field.Info?.CanFilter))"
-        @filter="filterFunc"
-        :use-chips="Field && (Field.UseChip || (Field.Info && Field.Info.Chip))"
-        v-bind="inputControlSettings"
-        :rules="Field.Rules"
-        :new-value-mode="Field?.NewValueMode ? 'add' : undefined"
-      >
+      <q-select v-else popup-content-class="free-field-select-control" hide-bottom-space :modelValue="fieldData.value"
+        @update:modelValue="selectChanged" :options="localOptions" option-value="Value" option-label="Label" map-options
+        emit-value :label="Field.Placeholder || $t(getModule('core-modules').config['defaultSelectFieldPlaceholder'])"
+        :multiple="Field.Multiple" :readonly="Field.ReadOnly" ref="fieldToValid"
+        :use-input="Field && (Field.UseInput || (Field.Info?.CanFilter))" @filter="filterFunc"
+        :use-chips="Field && (Field.UseChip || (Field.Info && Field.Info.Chip))" v-bind="inputControlSettings"
+        :rules="Field.Rules" :new-value-mode="Field?.NewValueMode ? 'add' : undefined">
         <template v-slot:before>
-          <span
-            :class="`field-label ${(Field.Label && Field.Label.trim().length)
-              ? '' : 'field-label-empty'} ${Field.Required ? 'required' : ''}`"
-            v-if="Field.Label !== void 0"
-          >
-            <q-tooltip
-              v-if="Field.Description"
-              anchor="top right"
-            >{{$t(Field.Description)}}</q-tooltip>
-            {{$t(Field.Label) || ''}}
-            <span
-              v-if="Field.Required"
-              class="required-mark"
-            >*</span>
+          <span :class="`field-label ${(Field.Label && Field.Label.trim().length)
+            ? '' : 'field-label-empty'} ${Field.Required ? 'required' : ''}`" v-if="Field.Label !== void 0">
+            <q-tooltip v-if="Field.Description" anchor="top right">{{ $t(Field.Description) }}</q-tooltip>
+            {{ $t(Field.Label) || '' }}
+            <span v-if="Field.Required" class="required-mark">*</span>
           </span>
         </template>
 
         <template v-slot:option="scope">
-          <q-item
-            v-bind="scope.itemProps"
-            v-on="scope.itemEvents"
-          >
-            <q-item-section
-              avatar
-              v-if="scope.opt.Icon"
-            >
+          <q-item v-bind="scope.itemProps" v-on="scope.itemEvents">
+            <q-item-section avatar v-if="scope.opt.Icon">
               <e-icon :name="scope.opt.Icon" />
             </q-item-section>
 
             <q-item-section>
-              <q-item-label v-html="scope.opt.Label" />
+              <q-item-label v-dompurify-html="scope.opt.Label" />
               <q-tooltip v-if="scope.opt.Tooltip">
-                {{scope.opt.Tooltip}}
+                {{ scope.opt.Tooltip }}
               </q-tooltip>
               <!-- <q-item-label caption v-if="scope.opt.Description" class="ellipsis">
                 {{ scope.opt.Description }}
@@ -112,63 +61,33 @@
       </q-select>
       <slot name="warning"></slot>
     </span>
-    <span
-      v-else
-      class="free-field-select-ascheck row items-start no-wrap"
-    >
-      <span
-        :class="`field-label ${(Field.Label && Field.Label.trim().length)
-          ? '' : 'field-label-empty'} ${Field.Required ? 'required' : ''}`"
-        v-if="Field.Label !== void 0"
-      >
-        <q-tooltip
-          v-if="Field.Description"
-          anchor="top right"
-        >{{$t(Field.Description)}}</q-tooltip>
-        {{$t(Field.Label) || ''}}
-        <span
-          v-if="Field.Required"
-          class="required-mark"
-        >*</span>
+    <span v-else class="free-field-select-ascheck row items-start no-wrap">
+      <span :class="`field-label ${(Field.Label && Field.Label.trim().length)
+        ? '' : 'field-label-empty'} ${Field.Required ? 'required' : ''}`" v-if="Field.Label !== void 0">
+        <q-tooltip v-if="Field.Description" anchor="top right">{{ $t(Field.Description) }}</q-tooltip>
+        {{ $t(Field.Label) || '' }}
+        <span v-if="Field.Required" class="required-mark">*</span>
       </span>
       <span class="column items-start no-wrap">
         <div>
           <slot name="warning"></slot>
         </div>
-        <div
-          class="checkbox-list row"
-          :class="hasError ? 'free-field--error' : ''"
-        >
-
-          <div
-            class="free-field--error-tag"
-            v-if="hasError"
-          >
+        <div class="checkbox-list row" :class="hasError ? 'free-field--error' : ''">
+
+          <div class="free-field--error-tag" v-if="hasError">
             <e-icon name="error"></e-icon>
           </div>
-          <q-checkbox
-            v-for="(option, index) in Field.Options"
-            :class="{
-              checked: checked.includes(option.Value),
-              'with-inner-extra': option.InnerExtra?.length,
-            }"
-            :key="index"
-            hide-bottom-space
-            :label="option.Label || ''"
-            v-model="checked"
-            :val="option.Value"
-            :disable="Field.ReadOnly"
-            @update:modelValue="checkChanged(option.Value)"
-            :checked-icon="checkedIcon(option)"
-          >
-            <q-tooltip v-if="option.opt?.Tooltip"
-              anchor="bottom middle">
-              {{$t(option.opt.Tooltip) || ''}}
+          <q-checkbox v-for="(option, index) in Field.Options" :class="{
+            checked: checked.includes(option.Value),
+            'with-inner-extra': option.InnerExtra?.length,
+          }" :key="index" hide-bottom-space :label="option.Label || ''" v-model="checked" :val="option.Value"
+            :disable="Field.ReadOnly" @update:modelValue="checkChanged(option.Value)"
+            :checked-icon="checkedIcon(option)">
+            <q-tooltip v-if="option.opt?.Tooltip" anchor="bottom middle">
+              {{ $t(option.opt.Tooltip) || '' }}
             </q-tooltip>
             <div class="option-inner-extra" v-if="option.InnerExtra?.length">
-              <free-field
-                v-for="(fld, idx) in option.InnerExtra || []" :key="idx"
-                :Field="fld"
+              <free-field v-for="(fld, idx) in option.InnerExtra || []" :key="idx" :Field="fld"
                 :values="data"></free-field>
             </div>
           </q-checkbox>
@@ -180,8 +99,8 @@
 
 <script>
 import { ref, computed, defineComponent, getCurrentInstance, watchEffect } from 'vue';
-import { useFreeField, freeFieldProps } from '../composible/useFreeField';
-import { useFormValidator} from '../../composible/useFormValidator';
+import { useFreeField, freeFieldProps } from '../composible/useFreeField.js';
+import { useFormValidator} from '../../composible/useFormValidator.js';
 
 const NUM_ICONS = [
   '①', '②', '③', '④', '⑤', '⑥', '⑦', '⑧', '⑨', '⑩',
@@ -445,7 +364,7 @@ export default defineComponent({
       }
 
       const paramObj = {};
-      const params = props.Field.Info.Params || '';
+      let params = props.Field.Info.Params || '';
       if (params.length > 0) {
         if (typeof params === 'string') {
           params = params.split(',');

package/free-field/Fields/SingleList.vue

@@ -1,41 +1,32 @@
 <template>
   <div class="free-field-single-list row" v-if="Field">
-    <span
-      :class="`field-label ${(Field.Label && Field.Label.trim().length)
-        ? '' : 'field-label-empty'} ${Field.Required ? 'required' : ''}`"
-      v-if="Field.Label !== void 0"
-    >
-      <q-tooltip
-        v-if="Field.Description"
-        anchor="top right"
-      >{{Field.Description}}</q-tooltip>
-      {{Field.Label || ''}}
-      <span
-        v-if="Field.Required"
-        class="required-mark"
-      >*</span>
+    <span :class="`field-label ${(Field.Label && Field.Label.trim().length)
+      ? '' : 'field-label-empty'} ${Field.Required ? 'required' : ''}`" v-if="Field.Label !== void 0">
+      <q-tooltip v-if="Field.Description" anchor="top right">{{ Field.Description }}</q-tooltip>
+      {{ Field.Label || '' }}
+      <span v-if="Field.Required" class="required-mark">*</span>
     </span>
 
     <table flat>
-        <thead v-if="Field && Field.Options && Field.Options.Header">
-            <tr>
-                <td>{{Field.Options.Header}}</td>
-            </tr>
-        </thead>
-        <tbody>
-            <tr v-for="(row, index) in localData" :key="index">
-                <td>
-                    {{row}}
-                </td>
-            </tr>
-        </tbody>
+      <thead v-if="Field && Field.Options && Field.Options.Header">
+        <tr>
+          <td>{{ Field.Options.Header }}</td>
+        </tr>
+      </thead>
+      <tbody>
+        <tr v-for="(row, index) in localData" :key="index">
+          <td>
+            {{ row }}
+          </td>
+        </tr>
+      </tbody>
     </table>
   </div>
 </template>
 
 <script>
-import { defineComponent, ref, computed } from 'vue';
-import { useFreeField, freeFieldProps } from '../composible/useFreeField';
+import { defineComponent, computed } from 'vue';
+import { useFreeField, freeFieldProps } from '../composible/useFreeField.js';
 
 export default defineComponent({
   name: 'InputFieldSingleList',

package/free-field/Fields/YearRange.vue

@@ -1,48 +1,29 @@
 <template>
   <span class="free-field-year-range simple-field">
     <span v-if="Field.ReadOnly">
-      <span
-        :class="`field-label field-label-readonly ${(Field.Label && Field.Label.trim().length)
-            ? '' : 'field-label-empty'} ${Field.Required ? 'required' : ''}`"
-        v-if="Field.Label"
-      >
-        <q-tooltip v-if="Field.Description" anchor="top right">{{Field.Description}}</q-tooltip>
-        {{Field.Label || ''}}
+      <span :class="`field-label field-label-readonly ${(Field.Label && Field.Label.trim().length)
+        ? '' : 'field-label-empty'} ${Field.Required ? 'required' : ''}`" v-if="Field.Label">
+        <q-tooltip v-if="Field.Description" anchor="top right">{{ Field.Description }}</q-tooltip>
+        {{ Field.Label || '' }}
         <span v-if="Field.Required" class="required-mark">*</span>
       </span>
-      <span class="readonly-content">{{fieldData.value}}</span>
+      <span class="readonly-content">{{ fieldData.value }}</span>
     </span>
     <span v-else class="row items-center no-wrap">
-      <q-select
-        v-model="range.min"
-        hide-bottom-space
-        :options="minYearOptions"
-        :readonly="Field.ReadOnly"
-        @update:modelValue="rangeChanged"
-        v-bind="inputControlSettings"
-        ref="input_field_validator_first"
-      >
+      <q-select v-model="range.min" hide-bottom-space :options="minYearOptions" :readonly="Field.ReadOnly"
+        @update:modelValue="rangeChanged" v-bind="inputControlSettings" ref="input_field_validator_first">
         <template v-slot:before v-if="Field.Label !== void 0">
-          <span
-            :class="`field-label ${(Field.Label && Field.Label.trim().length)
-            ? '' : 'field-label-empty'} ${Field.Required ? 'required' : ''}`"
-          >
-            <q-tooltip v-if="Field.Description" anchor="top right">{{Field.Description}}</q-tooltip>
-            {{Field.Label || ''}}
+          <span :class="`field-label ${(Field.Label && Field.Label.trim().length)
+            ? '' : 'field-label-empty'} ${Field.Required ? 'required' : ''}`">
+            <q-tooltip v-if="Field.Description" anchor="top right">{{ Field.Description }}</q-tooltip>
+            {{ Field.Label || '' }}
             <span v-if="Field.Required" class="required-mark">*</span>
           </span>
         </template>
       </q-select>
-      <span class="free-field-range-separator">{{`${Field.Separator || '~'}`}}</span>
-      <q-select
-        v-model="range.max"
-        hide-bottom-space
-        :options="maxYearOptions"
-        :readonly="Field.ReadOnly"
-        @update:modelValue="rangeChanged"
-        v-bind="inputControlSettings"
-        ref="input_field_validator_second"
-      />
+      <span class="free-field-range-separator">{{ `${Field.Separator || '~'}` }}</span>
+      <q-select v-model="range.max" hide-bottom-space :options="maxYearOptions" :readonly="Field.ReadOnly"
+        @update:modelValue="rangeChanged" v-bind="inputControlSettings" ref="input_field_validator_second" />
     </span>
 
     <slot name="warning"></slot>
@@ -50,9 +31,9 @@
 </template>
 
 <script>
-import { defineComponent, ref } from 'vue';
-import { useFreeField, freeFieldProps } from '../composible/useFreeField';
-import { useFormValidator} from '../../composible/useFormValidator';
+import { defineComponent, ref, watch, watchEffect, computed } from 'vue';
+import { useFreeField, freeFieldProps } from '../composible/useFreeField.js';
+import { useFormValidator} from '../../composible/useFormValidator.js';
 
 export default defineComponent({
   name: 'InputFieldYearRange',
@@ -96,6 +77,11 @@ export default defineComponent({
     const min = ref('');
     const max = ref('');
 
+    const range = ref({
+      min: min,
+      max: max,
+    });
+
     const rangeChanged = () => {
       setFieldData([min.value, max.value].join(props.Field.Separator || '~'), emit);
     };

package/free-field/Fields/pdfviewer.js

@@ -57,9 +57,9 @@ export default {
           },
           [
             ($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),
           ],
         );
@@ -69,7 +69,7 @@ export default {
     };
   },
   methods: {
-    // eslint-disable-next-line no-underscore-dangle
+
     __renderObject(h) {
       return h(
         'object',
@@ -89,13 +89,13 @@ export default {
         },
         [
           // browser object not supported, try iframe
-          // eslint-disable-next-line no-underscore-dangle
+
           this.__renderIFrame(h),
         ],
       );
     },
 
-    // eslint-disable-next-line no-underscore-dangle
+
     __renderIFrame(h) {
       return h(
         'iframe',
@@ -108,7 +108,6 @@ export default {
       );
     },
 
-    // eslint-disable-next-line no-underscore-dangle
     __renderIFramePDFJS(h) {
       return h(
         'iframe',

package/free-field/composible/fieldWrapper.js

@@ -31,7 +31,7 @@ export default defineComponent({
 
     const localField = computed(() => {
       const lField = Object.clone(props.Field);
-      
+
       lField.Rules = lField.Rules || [];
       for (let i = 0; i < lField.Rules.length; i += 1) {
         const rule = lField.Rules[i];
@@ -70,7 +70,6 @@ export default defineComponent({
       `;
 
       try {
-        // eslint-disable-next-line no-eval
         return eval(funcStr);
       } catch (ex) {
         console.error(ex)

package/free-field/composible/useUploader.js

@@ -8,7 +8,7 @@ function fileSizeStrToNumber (s) {
   const sizeMatch = s.match(/^([0-9]*)(k|m|g*)(b*)/);
 
   if (sizeMatch) {
-    // eslint-disable-next-line no-unused-vars
+
     // const [tmp, num, unit] = sizeMatch;
     const num = sizeMatch[1];
     const unit = sizeMatch[2];
@@ -58,7 +58,7 @@ function fileSizeNumberToStr (s) {
   return `${sizeNum.toFixed(2)}${unit}`;
 }
 
-// eslint-disable-next-line no-underscore-dangle
+
 function _getFileType (f) {
   if (!f) return {};
 
@@ -100,7 +100,7 @@ function _getFileType (f) {
   return {};
 }
 
-export function useUploader(props, ctx) {
+export function useUploader(props) {
   const { proxy:vm } = getCurrentInstance();
 
   const showPreview = ref(false);
@@ -169,7 +169,7 @@ export function useUploader(props, ctx) {
 
     switch (fType) {
       case 'image':
-        // eslint-disable-next-line no-underscore-dangle
+
         type = file.id || (file.__img ? file.__img.src : '');
         break;
       case 'audio':
@@ -269,7 +269,7 @@ export function useUploader(props, ctx) {
         if (file.id) {
           url = vm.$filter('serverImage', file.id);
         } else {
-          // eslint-disable-next-line no-underscore-dangle
+
           url = file.__img ? file.__img.src : '';
         }
         break;

package/index.js

@@ -1,12 +1,12 @@
 import { getCurrentInstance } from 'vue';
 import { date as quasarDate } from 'quasar';
 import config from '@/config';
-import useAppStore from '@/stores/app';
+// import useAppStore from '@/stores/app';
 import MsgDialog from './components/Dialog/index';
 
 import EIcon from './components/Basic/EIcon.vue';
-import StickyButtons from './components/StickyButtons';
-import SelectLocales from './components/SelectLocales';
+import StickyButtons from './components/StickyButtons/index.vue';
+import SelectLocales from './components/SelectLocales/index.vue';
 import SummaryHead from './components/Basic/SummaryHead.vue';
 import SlidingCarousel from './components/SlidingCarousel/index.vue';
 import SlidingNews from './components/SlidingNews/index.vue';
@@ -185,7 +185,6 @@ const filters = {
       }
       desc = step.Description.find((s) => s.Status === (status || stepStatus || '').toString());
       desc = desc ? desc.Description : '';
-      desc = desc;
     }
 
     desc = desc || '未知状态';
@@ -196,10 +195,10 @@ const filters = {
 export default (app, root) => {
   root.use(MsgDialog);
 
-  const appStore = useAppStore();
+  // const appStore = useAppStore();
 
   const validatorMobilePhone = (d) => !d || /^(0|86|17951)?(13[0-9]|14[0-9]|15[0-9]|16[0-9]|17[0-9]|18[0-9]|19[0-9])[0-9]{8}$/.test(d);
-  const validatorEmail = (d) => !d || /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(d);
+  const validatorEmail = (d) => !d || /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/.test(d);
   return {
     config: {
       backendDependencies: ["core-modules"],
@@ -413,7 +412,7 @@ export default (app, root) => {
       validatorOnlyNIZ: (d) => /^([0]|-[1-9][0-9]+)$/.test(d.toString()),
 
       //
-      validatorUrl: (d) => /^(ht|f)tp(s?)\:\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-\.\?\,\'\/\\\+&amp;%\$#_]*)?/.test(d),
+      validatorUrl: (d) => /^(ht|f)tp(s?):\/\/[0-9a-zA-Z]([-.\w]*[0-9a-zA-Z])*(:(0-9)*)*(\/?)([a-zA-Z0-9\-.?,'/\\+&amp;%$#_]*)?/.test(d),
       validatorOfficePhone: (d) => /^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{8}$/.test(d),
       validatorChinaZip: (d) => /^[1-9]{1}(\d+){5}$/.test(d),
 
@@ -421,8 +420,8 @@ export default (app, root) => {
       validatorPwd0: (d) => /^.*(?=.{6,16}).*$/.test(d),
       validatorPwd1: (d) => /^.{6,16}$/.test(d),
       validatorPwd2: (d) => /^.*(?=.{6,16})(?=.*\d)(?=.*[A-Z])(?=.*[a-z]).*$/.test(d),
-      validatorPwd3: (d) => /^.*(?=.{6,16})(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*?\(\)]).*$/.test(d),
-      validatorPwd4: (d) => /^.*(?=.{6,16})(?=.*\d)(?=.*[A-Z]{2,})(?=.*[a-z]{2,})(?=.*[!@#$%^&*?\(\)]).*$/.test(d),
+      validatorPwd3: (d) => /^.*(?=.{6,16})(?=.*\d)(?=.*[A-Z])(?=.*[a-z])(?=.*[!@#$%^&*?()]).*$/.test(d),
+      validatorPwd4: (d) => /^.*(?=.{6,16})(?=.*\d)(?=.*[A-Z]{2,})(?=.*[a-z]{2,})(?=.*[!@#$%^&*?()]).*$/.test(d),
     },
   }
 };

package/package.json

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