free-fe-core-modules 0.1.10 → 0.1.12

package/free-field/Fields/File.vue

@@ -101,11 +101,40 @@
 
 <script>
 import { computed, defineComponent, getCurrentInstance, ref } from 'vue';
+import { useRoute } from 'vue-router';
 import { useFreeField, freeFieldProps } from '../composible/useFreeField.js';
 import { useFormValidator} from '../../composible/useFormValidator.js';
 import { useUploader } from '../composible/useUploader.js';
 import PdfViewer from './pdfviewer.js';
 
+function parseStaticResourceParams(paramStr, route) {
+  if (!paramStr || paramStr.trim().length <= 0) {
+    return '';
+  }
+
+  let finalParamStr = paramStr || '';
+
+  const paramList = paramStr.match(/\{[^\}]+\}/g);
+  const paramValuesMap = {};
+  for (let i = 0; i < paramList.length; i += 1) {
+    const varItem = paramList[i];
+    if (paramValuesMap[varItem]) {
+      continue;
+    }
+
+    const varName = varItem.replace('{', '').replace('}', '');
+    const varValue = Object.nestValue(route, varName) || '';
+
+    console.log('varName, varValue', varName, varValue);
+
+    finalParamStr = finalParamStr.replace(new RegExp(varItem, 'g'), varValue);
+
+    paramValuesMap[varItem] = 1;
+  }
+
+  return finalParamStr;
+}
+
 export default defineComponent({
   name: 'InputFieldFile',
   props: {
@@ -146,6 +175,27 @@ export default defineComponent({
         Name: 'Options.PdfViewerVersion',
         Default: '',
       },
+      {
+        Type: 'String',
+        Label: '可访问用户',
+        Name: 'Options.staticResourceUsers',
+        Placeholder: '逗号分隔的用户ID列表，self表示当前用户，比如：user1ID,self,user3ID',
+        Default: '',
+      },
+      {
+        Type: 'String',
+        Label: '可访问来源',
+        Name: 'Options.staticResourceReferers',
+        Placeholder: '逗号分隔的来源列表，支持正则表达式。比如：/admin/f/case/{params.id}/(2|3|4|5)',
+        Default: '',
+      },
+      {
+        Type: 'String',
+        Label: '所需权限',
+        Name: 'Options.staticResourcePerms',
+        Placeholder: '逗号分隔的API路径列表，不支持正则表达式！比如：/api/case/{params.id}/2/view,/api/case/{params.id}/3/view',
+        Default: '',
+      },
     ],
     Description: '',
   },
@@ -194,10 +244,28 @@ export default defineComponent({
       return isValid;
     };
 
+    const route = useRoute();
     const factoryFn = () => {
+      // 静态资源访问权限控制
+      const {staticResourcePerms, staticResourceReferers, staticResourceUsers} = props.Field.Options || {};
+
       return {
         url: props.Field.url || `${vm.ctx.config.baseUrl}/upload`,
         fieldName: 'file',
+        formFields: [
+          {
+            name: 'users',
+            value: staticResourceUsers || '',
+          },
+          {
+            name: 'perms',
+            value: parseStaticResourceParams(staticResourcePerms, route) || '',
+          },
+          {
+            name: 'refs',
+            value: parseStaticResourceParams(staticResourceReferers, route) || '',
+          }
+        ],
       };
     };
 

package/free-field/Fields/FileList.vue

@@ -123,11 +123,40 @@
 
 <script>
 import { computed, defineComponent, getCurrentInstance, ref } from 'vue';
+import { useRoute } from 'vue-router';
 import { useFreeField, freeFieldProps } from '../composible/useFreeField.js';
 import { useFormValidator} from '../../composible/useFormValidator.js';
 import { useUploader } from '../composible/useUploader.js';
 import PdfViewer from './pdfviewer.js';
 
+function parseStaticResourceParams(paramStr, route) {
+  if (!paramStr || paramStr.trim().length <= 0) {
+    return '';
+  }
+
+  let finalParamStr = paramStr || '';
+
+  const paramList = paramStr.match(/\{[^\}]+\}/g);
+  const paramValuesMap = {};
+  for (let i = 0; i < paramList.length; i += 1) {
+    const varItem = paramList[i];
+    if (paramValuesMap[varItem]) {
+      continue;
+    }
+
+    const varName = varItem.replace('{', '').replace('}', '');
+    const varValue = Object.nestValue(route, varName) || '';
+
+    console.log('varName, varValue', varName, varValue);
+
+    finalParamStr = finalParamStr.replace(new RegExp(varItem, 'g'), varValue);
+
+    paramValuesMap[varItem] = 1;
+  }
+
+  return finalParamStr;
+}
+
 export default defineComponent({
   name: 'InputFieldFileList',
   fieldInfo: {
@@ -186,6 +215,27 @@ export default defineComponent({
         Name: 'Options.PdfViewerVersion',
         Default: '',
       },
+      {
+        Type: 'String',
+        Label: '可访问用户',
+        Name: 'Options.staticResourceUsers',
+        Placeholder: '逗号分隔的用户ID列表，self表示当前用户，比如：user1ID,self,user3ID',
+        Default: '',
+      },
+      {
+        Type: 'String',
+        Label: '可访问来源',
+        Name: 'Options.staticResourceReferers',
+        Placeholder: '逗号分隔的来源列表，支持正则表达式。比如：/admin/f/case/{params.id}/(2|3|4|5)',
+        Default: '',
+      },
+      {
+        Type: 'String',
+        Label: '所需权限',
+        Name: 'Options.staticResourcePerms',
+        Placeholder: '逗号分隔的API路径列表，不支持正则表达式！比如：/api/case/{params.id}/2/view,/api/case/{params.id}/3/view',
+        Default: '',
+      },
     ],
     Description: '',
   },
@@ -238,10 +288,28 @@ export default defineComponent({
       return isValid;
     };
 
+    const route = useRoute();
     const factoryFn = () => {
+      // 静态资源访问权限控制
+      const {staticResourcePerms, staticResourceReferers, staticResourceUsers} = props.Field.Options || {};
+
       return {
         url: props.Field.url || `${vm.ctx.config.baseUrl}/upload`,
         fieldName: 'file',
+        formFields: [
+          {
+            name: 'users',
+            value: staticResourceUsers || '',
+          },
+          {
+            name: 'perms',
+            value: parseStaticResourceParams(staticResourcePerms, route) || '',
+          },
+          {
+            name: 'refs',
+            value: parseStaticResourceParams(staticResourceReferers, route) || '',
+          }
+        ],
       };
     };
 

package/free-field/Fields/Image.vue

@@ -111,10 +111,39 @@
 
 <script>
 import { defineComponent, getCurrentInstance, ref } from 'vue';
+import { useRoute } from 'vue-router';
 import { useFreeField, freeFieldProps } from '../composible/useFreeField.js';
 import { useFormValidator} from '../../composible/useFormValidator.js';
 import { useUploader } from '../composible/useUploader.js';
 
+function parseStaticResourceParams(paramStr, route) {
+  if (!paramStr || paramStr.trim().length <= 0) {
+    return '';
+  }
+
+  let finalParamStr = paramStr || '';
+
+  const paramList = paramStr.match(/\{[^\}]+\}/g);
+  const paramValuesMap = {};
+  for (let i = 0; i < paramList.length; i += 1) {
+    const varItem = paramList[i];
+    if (paramValuesMap[varItem]) {
+      continue;
+    }
+
+    const varName = varItem.replace('{', '').replace('}', '');
+    const varValue = Object.nestValue(route, varName) || '';
+
+    console.log('varName, varValue', varName, varValue);
+
+    finalParamStr = finalParamStr.replace(new RegExp(varItem, 'g'), varValue);
+
+    paramValuesMap[varItem] = 1;
+  }
+
+  return finalParamStr;
+}
+
 export default defineComponent({
   name: 'InputFieldImage',
   fieldInfo: {
@@ -140,6 +169,27 @@ export default defineComponent({
         Label: '不使用缩略图',
         Name: 'Options.NoThumb',
       },
+      {
+        Type: 'String',
+        Label: '可访问用户',
+        Name: 'Options.staticResourceUsers',
+        Placeholder: '逗号分隔的用户ID列表，self表示当前用户，比如：user1ID,self,user3ID',
+        Default: '',
+      },
+      {
+        Type: 'String',
+        Label: '可访问来源',
+        Name: 'Options.staticResourceReferers',
+        Placeholder: '逗号分隔的来源列表，支持正则表达式。比如：/admin/f/case/{params.id}/(2|3|4|5)',
+        Default: '',
+      },
+      {
+        Type: 'String',
+        Label: '所需权限',
+        Name: 'Options.staticResourcePerms',
+        Placeholder: '逗号分隔的API路径列表，不支持正则表达式！比如：/api/case/{params.id}/2/view,/api/case/{params.id}/3/view',
+        Default: '',
+      },
     ],
     Description: '',
   },
@@ -190,10 +240,28 @@ export default defineComponent({
       return isValid;
     };
 
+    const route = useRoute();
     const factoryFn = () => {
+      // 静态资源访问权限控制
+      const {staticResourcePerms, staticResourceReferers, staticResourceUsers} = props.Field.Options || {};
+
       return {
         url: props.Field.url || `${vm.ctx.config.baseUrl}/upload`,
         fieldName: 'file',
+        formFields: [
+          {
+            name: 'users',
+            value: staticResourceUsers || '',
+          },
+          {
+            name: 'perms',
+            value: parseStaticResourceParams(staticResourcePerms, route) || '',
+          },
+          {
+            name: 'refs',
+            value: parseStaticResourceParams(staticResourceReferers, route) || '',
+          }
+        ],
       };
     };
 

package/free-field/Fields/ImageList.vue

@@ -103,10 +103,39 @@
 
 <script>
 import { computed, defineComponent, getCurrentInstance, ref } from 'vue';
+import { useRoute } from 'vue-router';
 import { useFreeField, freeFieldProps } from '../composible/useFreeField.js';
 import { useFormValidator} from '../../composible/useFormValidator.js';
 import { useUploader } from '../composible/useUploader.js';
 
+function parseStaticResourceParams(paramStr, route) {
+  if (!paramStr || paramStr.trim().length <= 0) {
+    return '';
+  }
+
+  let finalParamStr = paramStr || '';
+
+  const paramList = paramStr.match(/\{[^\}]+\}/g);
+  const paramValuesMap = {};
+  for (let i = 0; i < paramList.length; i += 1) {
+    const varItem = paramList[i];
+    if (paramValuesMap[varItem]) {
+      continue;
+    }
+
+    const varName = varItem.replace('{', '').replace('}', '');
+    const varValue = Object.nestValue(route, varName) || '';
+
+    console.log('varName, varValue', varName, varValue);
+
+    finalParamStr = finalParamStr.replace(new RegExp(varItem, 'g'), varValue);
+
+    paramValuesMap[varItem] = 1;
+  }
+
+  return finalParamStr;
+}
+
 export default defineComponent({
   name: 'InputFieldImageList',
   fieldInfo: {
@@ -132,6 +161,27 @@ export default defineComponent({
         Name: 'Options.MaxTotal',
         Default: '50m',
       },
+      {
+        Type: 'String',
+        Label: '可访问用户',
+        Name: 'Options.staticResourceUsers',
+        Placeholder: '逗号分隔的用户ID列表，self表示当前用户，比如：user1ID,self,user3ID',
+        Default: '',
+      },
+      {
+        Type: 'String',
+        Label: '可访问来源',
+        Name: 'Options.staticResourceReferers',
+        Placeholder: '逗号分隔的来源列表，支持正则表达式。比如：/admin/f/case/{params.id}/(2|3|4|5)',
+        Default: '',
+      },
+      {
+        Type: 'String',
+        Label: '所需权限',
+        Name: 'Options.staticResourcePerms',
+        Placeholder: '逗号分隔的API路径列表，不支持正则表达式！比如：/api/case/{params.id}/2/view,/api/case/{params.id}/3/view',
+        Default: '',
+      },
     ],
     Description: '',
   },
@@ -181,10 +231,28 @@ export default defineComponent({
       return isValid;
     };
 
+    const route = useRoute();
     const factoryFn = () => {
+      // 静态资源访问权限控制
+      const {staticResourcePerms, staticResourceReferers, staticResourceUsers} = props.Field.Options || {};
+
       return {
         url: props.Field.url || `${vm.ctx.config.baseUrl}/upload`,
         fieldName: 'file',
+        formFields: [
+          {
+            name: 'users',
+            value: staticResourceUsers || '',
+          },
+          {
+            name: 'perms',
+            value: parseStaticResourceParams(staticResourcePerms, route) || '',
+          },
+          {
+            name: 'refs',
+            value: parseStaticResourceParams(staticResourceReferers, route) || '',
+          }
+        ],
       };
     };
 

package/free-field/Fields/MixedTable.vue

@@ -53,7 +53,7 @@
                 :key="fIndex"
                 :Field="{...f, ReadOnly: Field.ReadOnly || f.ReadOnly}"
                 :values="fieldData.value"
-                @input="cellChanged(f)"
+                @input="cellChanged(f, $event)"
                 ref="fieldsToValid"
               ></free-field>
             </span>
@@ -64,7 +64,7 @@
               <free-field
                 :Field="{...r[rk].List[0], ReadOnly: Field.ReadOnly || r[rk].List[0].ReadOnly}"
                 :values="fieldData.value"
-                @input="cellChanged(r[rk].List[0])"
+                @input="cellChanged(r[rk].List[0], $event)"
                 borderless
                 ref="fieldToValid"
               ></free-field>
@@ -359,8 +359,10 @@ export default defineComponent({
       columns,
       summaryContent,
 
-      cellChanged: (f) => {
+      cellChanged: (f, subF) => {
+        emit('input', subF);
         emit('input', f);
+        // emit('input'); // we have this in v2.0, is it necessary?
       },
       localRows: computed(() => {
         if (!props.Field?.Options?.Rows) return [];

package/free-field/Fields/Rich.vue

@@ -58,6 +58,11 @@
           skin: isDark ? 'oxide-dark' : 'oxide',
           content_css: isDark ? 'dark' : '',
           promotion: false,
+          content_style: 'body[data-mce-placeholder]::before { white-space: pre-wrap; }',
+
+          convert_urls: false,  // 禁止转换 URL
+          relative_urls: false, // 禁止使用相对 URL
+          remove_script_host: false // 保留主机名
         }"
         initial-value
         model-events
@@ -366,7 +371,7 @@ export default defineComponent({
           },
         }).then((res) => {
           if (res && res.data && res.data.id) {
-            resolve(`${vm.ctx.config.imageUrlBase}${res.data.id}`);
+            resolve(`${window.location.protocol}//${window.location.hostname}${window.location.port ? `:${window.location.port}` : ''}${this.ctx.config.imageUrlBase}${res.data.id}${this.Field.Options?.UploadedImageUrlArgs || ''}`);
           } else {
             reject({
               message: '上传失败',

package/free-field/Fields/Row.vue

@@ -2,7 +2,7 @@
   <div class="free-field-row row" :class="rowClasses" v-if="Field">
     <free-field
       v-for="(field, idx) in Field.Options?.Fields"
-      :Field="field"
+      :Field="{...field, ReadOnly: Field.ReadOnly || field.ReadOnly}"
       :values="fieldData.value"
       :key="idx"
       ref="fieldsToValidate"

package/free-field/Fields/Select.vue

@@ -60,6 +60,19 @@
         </template>
       </q-select>
       <slot name="warning"></slot>
+      <div v-if="selectedOptionsExtra.length">
+        <free-field
+          @click.stop
+          @keydown.stop
+          @keypress.stop
+          @keyup.stop
+          @input="innerExtraFieldInput(fld)"
+          v-for="(fld, idx) in selectedOptionsExtra" :key="idx"
+          :Field="{...fld, ReadOnly: Field.ReadOnly || fld.ReadOnly}"
+          :values="values"
+          ref="fieldToValid">
+        </free-field>
+      </div>
     </span>
     <span v-else class="free-field-select-ascheck row items-start no-wrap">
       <span :class="`field-label ${(Field.Label && Field.Label.trim().length)
@@ -77,20 +90,51 @@
           <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-tooltip>
-            <div class="option-inner-extra" v-if="option.InnerExtra?.length">
-              <free-field v-for="(fld, idx) in option.InnerExtra || []" :key="idx" :Field="fld"
-                :values="data"></free-field>
-            </div>
-          </q-checkbox>
+
+          <div
+            class="option-item"
+            :class="{
+              padding: option.opt?.PaddingLeft,
+            }"
+            v-for="(option, index) in Field.Options"
+            :key="index" >
+
+            <div
+              class="just-a-label"
+              v-if="option.opt?.asLabel">{{ option.Label }}</div>
+
+            <q-checkbox
+              v-else
+              :class="{
+                checked: checked.includes(option.Value),
+                'with-inner-extra': option.InnerExtra?.length,
+              }"
+              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="(fieldData === option?.Value || (fieldData && fieldData.indexOf && (fieldData.indexOf(option?.Value) >= 0))) && option.InnerExtra?.length">
+                <free-field
+                  @click.stop
+                  @keydown.stop
+                  @keypress.stop
+                  @keyup.stop
+                  @input="innerExtraFieldInput(fld)"
+                  v-for="(fld, idx) in option.InnerExtra || []" :key="idx"
+                  :Field="{...fld, ReadOnly: Field.ReadOnly || fld.ReadOnly}"
+                  :values="values"
+                  ref="fieldToValid">
+                </free-field>
+              </div>
+            </q-checkbox>
+          </div>
         </div>
       </span>
     </span>
@@ -288,6 +332,7 @@ export default defineComponent({
         (valueList || []).forEach((vl) => {
           const theOpt = props.Field.Options.find((opt) => opt.Value === vl);
           if (theOpt) labelList.push(theOpt.Label || fieldData.value);
+          else labelList.push(vl);
         });
 
         return labelList.join(',');
@@ -414,10 +459,26 @@ export default defineComponent({
 
     const localOptions = ref(props.Field.Options || []);
 
+    const selectedOptionsExtra = computed(() => {
+      let opts = [];
+      if (fieldData.value) {
+        if (props.Field.Multiple) {
+          const vals = Array.isArray(fieldData.value) ? fieldData.value : (`${fieldData.value}`).split(',');
+          opts = (localOptions.value || []).filter((opt) => vals.indexOf(opt.Value) >= 0);
+        }
+
+        opts = (localOptions.value || []).filter((opt) => opt.Value === fieldData.value);
+      }
+
+      return opts.map((opt) => opt.Extra).flat();
+    });
+
+
     return {
       fieldData,
       setFieldData,
       localOptions,
+      selectedOptionsExtra,
 
       hasError,
       checked,
@@ -448,6 +509,11 @@ export default defineComponent({
           });
         })
       },
+
+      innerExtraFieldInput: (fld) => {
+        selfValidate();
+        emit('input', fld);
+      },
     };
   },
 });

package/package.json

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