free-fe-core-modules 0.1.16 → 0.1.18

package/components/Basic/EIcon.vue

@@ -41,7 +41,7 @@ export default defineComponent({
       if (props.name.startsWith('blob:')) return props.name;
 
       // TODO:默认使用二倍图？
-      if (props.relative) return `images/${props.name}${props.defaultSize}.png`;
+      if (props.relative) return `${import.meta.env.BASE_URL}images/${props.name}${props.defaultSize}.png`;
 
       const ret = props.thumb
         ? vm.$filter('serverThumb', props.name)

package/components/Dialog/BasicDialog.vue

@@ -150,7 +150,9 @@ export default defineComponent({
     fieldsClass: { type: String, default: '' },
     dialogClass: { type: String, default: '' },
 
-    remove: { type: Function, default: () => {}}
+    remove: { type: Function, default: () => {}},
+
+    noRejectOnCancel: { type: Boolean, default: false },
   },
   components: {
     FreeField,
@@ -242,12 +244,16 @@ export default defineComponent({
       }
 
       if (reject.value) {
-        reject.value('cancel');
-
-        if (typeof props.remove === 'function'){
-          props.remove();
+        if (!props.noRejectOnCancel) {
+          reject.value('cancel');
+        } else {
+          emit('ok');
         }
       }
+
+      if (typeof props.remove === 'function'){
+        props.remove();
+      }
     };
 
     const btn_ok = () => {

package/free-field/Fields/Rich.vue

@@ -51,7 +51,7 @@
           default_link_target: (Field && Field.Options && Field.Options.LinkTarget) || '_blank',
 
           automatic_uploads: (Field && Field.Options && Field.Options.NoUpload) ? false : true,
-          images_upload_url: '/api/upload',
+          images_upload_url: `${this.ctx.config.baseUrl}/upload`,
           images_reuse_filename: true,
           images_upload_handler,
 

package/package.json

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