meixioacomponent 0.9.48-alpha-2 → 0.9.48

package/lib/components/dynamicmount/DynamicMountClass.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const vue_1 = __importDefault(require("vue"));
+const componentConfig_1 = __importDefault(require("../../config/componentConfig"));
 class DynamicMountClass {
     constructor(dynamicMount) {
         this.params = dynamicMount;
@@ -13,7 +13,7 @@ class DynamicMountClass {
         this.destroyCb = null;
     }
     init() {
-        this.domComponent = vue_1.default.prototype.$dynmaicMount({
+        this.domComponent = componentConfig_1.default.Vue.prototype.$dynmaicMount({
             mountedDom: this.params.mountedDom,
             vueComponent: this.params.vueComponent,
             componentProps: this.params.componentProps,

package/lib/components/dynamicmount/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../packages/components/dynamicmount/index.ts"],"names":[],"mappings":";;;AA0DA,wBAIC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../packages/components/dynamicmount/index.ts"],"names":[],"mappings":";;;AAyDA,wBAIC"}

package/lib/components/dynamicmount/index.js

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-ignore
 const dynamicMount_vue_1 = __importDefault(require("./dynamicMount.vue"));
 const componentConfig_1 = __importDefault(require("../../config/componentConfig"));
-const vue_1 = __importDefault(require("vue"));
-const ComponentInsertConstructor = vue_1.default.extend(dynamicMount_vue_1.default);
 //使用方法
 // this.$dynmaicMount({
 //     mountedDom: "",
@@ -15,6 +13,7 @@ const ComponentInsertConstructor = vue_1.default.extend(dynamicMount_vue_1.defau
 //     componentProps: "",
 //   });
 const Insert = (options) => {
+    const ComponentInsertConstructor = componentConfig_1.default.Vue.extend(dynamicMount_vue_1.default);
     componentConfig_1.default.setDynamicId();
     let id = componentConfig_1.default.dynamicId;
     const componentInsertConstructor = new ComponentInsertConstructor();

package/lib/components/index.d.ts

@@ -64,7 +64,7 @@ declare const meixioacomponent: {
         cbList: any[];
         dynamicMount: import("../typings/type").DynamicMountInterface | null;
         lock: Boolean;
-        toUpload(uploadList: any, cb: any): void;
+        toUpload(uploadList: any, cb: any, isOss: any): boolean;
         uploadEd(evt?: null): void;
         appendUploadItem(list: any): void;
     };

package/lib/components/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/components/index.ts"],"names":[],"mappings":"AAqDA,OAAO,iBAAiB,MAAM,kCAAkC,CAAA;AAGhE,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAS5C,OAAO,aAAa,MAAM,yBAAyB,CAAC;AAmFpD,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoErB,CAAA;AAID,eAAe,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../packages/components/index.ts"],"names":[],"mappings":"AAqDA,OAAO,iBAAiB,MAAM,kCAAkC,CAAA;AAGhE,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAS5C,OAAO,aAAa,MAAM,yBAAyB,CAAC;AAsFpD,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAoErB,CAAA;AAID,eAAe,gBAAgB,CAAA"}

package/lib/components/index.js

@@ -121,6 +121,7 @@ const meixicomponents = [
     baseWait_1.default
 ];
 const install = (Vue) => {
+    componentConfig_1.default.Vue = Vue;
     meixicomponents.forEach((baseComponent) => {
         Vue.component(baseComponent.name, baseComponent);
     });
@@ -134,6 +135,8 @@ const install = (Vue) => {
         DynamicMountClass: DynamicMountClass_1.default
     };
     window[`meixiComponentConfig`] = componentConfig_1.default;
+    componentConfig_1.default.createDialogCacheWrap();
+    componentConfig_1.default.eventBus = new componentConfig_1.default.Vue();
 };
 //
 if (typeof window !== 'undefined' && window[`Vue`]) {

package/lib/config/componentConfig.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"componentConfig.d.ts","sourceRoot":"","sources":["../../packages/config/componentConfig.ts"],"names":[],"mappings":"AAOA,OAAO,EAAC,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAEpD,QAAA,MAAM,eAAe,EAAE,mBAiEtB,CAAA;AAED,eAAe,eAAe,CAAA"}
+{"version":3,"file":"componentConfig.d.ts","sourceRoot":"","sources":["../../packages/config/componentConfig.ts"],"names":[],"mappings":"AAKA,OAAO,EAAC,mBAAmB,EAAC,MAAM,iBAAiB,CAAC;AAEpD,QAAA,MAAM,eAAe,EAAE,mBAoEtB,CAAA;AAED,eAAe,eAAe,CAAA"}

package/lib/config/componentConfig.js

@@ -3,8 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const vue_1 = __importDefault(require("vue"));
-const useElement_1 = require("./useElement");
 const selectStore_1 = __importDefault(require("./storeModule/selectStore"));
 const dialogCacheStore_1 = __importDefault(require("./storeModule/dialogCacheStore"));
 // @ts-ignore
@@ -16,8 +14,9 @@ const componentConfig = {
     dynamicId: 0,
     uploadUrl: '',
     uploadPrefix: '',
-    eventBus: new vue_1.default(),
+    eventBus: null,
     selectStore: null,
+    Vue: null,
     LinkViewClass: LinkViewClass_1.default,
     dialogCacheComponent: {},
     uploadStoreList: ['meixidev'],
@@ -28,14 +27,14 @@ const componentConfig = {
         componentConfig.uploadPrefix = url;
     },
     setUploadUrl: (storeType, uploadType) => {
-        componentConfig.uploadUrl = `${componentConfig.uploadPrefix}/${componentConfig.uploadStoreList[storeType]}/${uploadType}/upload`;
+        // componentConfig.uploadUrl = `${componentConfig.uploadPrefix}/${componentConfig.uploadStoreList[storeType]}/${uploadType}/upload`
+        componentConfig.uploadUrl = `${componentConfig.uploadPrefix}`;
     },
     setUploadCustomUrl: (url) => {
         componentConfig.uploadUrl = url;
     },
     initConfig: (_store, _router) => {
         // 注册element 组件
-        (0, useElement_1.useElementComponent)();
         // 动态注册vuex modules
         _store[`registerModule`]('selectStore', selectStore_1.default);
         // 注册vuex里面selectStore管理类
@@ -45,20 +44,19 @@ const componentConfig = {
         componentConfig.selectStore =
             componentConfig.store[`getters`]['selectStore/getSelectStore'];
         componentConfig.registerModuleOfCacheDialog(_store);
-        componentConfig.createDialogCacheWrap();
     },
     registerModuleOfCacheDialog: (_store) => {
         _store[`registerModule`]('dialogCacheStore', dialogCacheStore_1.default);
     },
     // 生成隐藏dialog的容器
     createDialogCacheWrap: () => {
-        const component = vue_1.default.extend(index_vue_1.default);
+        const component = componentConfig.Vue.extend(index_vue_1.default);
         componentConfig.dialogCacheComponent = new component({
             // @ts-ignore
             store: componentConfig.store,
             router: componentConfig.router,
         });
-        vue_1.default.nextTick(() => {
+        componentConfig.Vue.nextTick(() => {
             const cacheWrap = document.createElement('div');
             cacheWrap.setAttribute('class', 'cacheWrap');
             document.body.appendChild(cacheWrap);

package/lib/config/uploadRequest.d.ts

@@ -1,3 +1,3 @@
-declare const _default: (file: any, uploadProgressFn: any, sourceToken: any) => Promise<unknown>;
+declare const _default: (params: any, uploadProgressFn: any, sourceToken: any) => Promise<unknown>;
 export default _default;
 //# sourceMappingURL=uploadRequest.d.ts.map

package/lib/config/uploadRequest.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"uploadRequest.d.ts","sourceRoot":"","sources":["../../packages/config/uploadRequest.ts"],"names":[],"mappings":";AAOA,wBAyEC"}
+{"version":3,"file":"uploadRequest.d.ts","sourceRoot":"","sources":["../../packages/config/uploadRequest.ts"],"names":[],"mappings":";AAKA,wBAsFC"}

package/lib/config/uploadRequest.js

@@ -13,15 +13,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = __importDefault(require("axios"));
-const utils_js_1 = require("../utils/utils.js");
-// @ts-ignore
-const componentConfig_1 = __importDefault(require("./componentConfig"));
-exports.default = (file, uploadProgressFn, sourceToken) => {
-    const ossInstance = (params, uploadProgressFn) => {
+exports.default = (params, uploadProgressFn, sourceToken) => {
+    const ossInstance = (data, uploadProgressFn) => {
         // 创建 axios 实例
         const instance = axios_1.default.create({
             // API 请求的默认前缀
-            baseURL: `${componentConfig_1.default.uploadUrl}`,
+            baseURL: `${params.get('url')}`,
         });
         // 异常拦截处理器
         const errorHandler = (error) => {
@@ -39,7 +36,9 @@ exports.default = (file, uploadProgressFn, sourceToken) => {
             // @ts-ignore
             config.headers['Content-Type'] = 'multipart/form-data';
             // @ts-ignore
-            config.headers['authorization'] = `Bearer ${(0, utils_js_1.GetToken)('token')}`;
+            config.headers['type'] = 'application/octet-stream';
+            // @ts-ignore
+            // config.headers['authorization'] = `Bearer ${GetToken('token')}`
             config.onUploadProgress = (progressEvent) => {
                 if (uploadProgressFn) {
                     // @ts-ignore
@@ -53,22 +52,30 @@ exports.default = (file, uploadProgressFn, sourceToken) => {
         instance.interceptors.response.use((response) => __awaiter(void 0, void 0, void 0, function* () {
             return response;
         }), resErrorHandler);
-        return instance(params);
+        return instance(data);
     };
     return new Promise((resolve, reject) => {
-        const params = new FormData();
-        params.append('file', file);
+        //  await 后端接口
         ossInstance({
-            url: '/',
+            url: '',
             data: params,
             method: 'post',
             cancelToken: sourceToken.token,
         }, uploadProgressFn)
             .then((res) => {
+            console.log(res);
             const { status } = res;
             if (status == 200) {
                 const { data } = res;
-                resolve(data.data.original);
+                if (data) {
+                    resolve(data.data.original);
+                }
+                else {
+                    // 返回oss的params；
+                    const url = params.get('url');
+                    const key = params.get('key');
+                    resolve(`${url}/${key}`);
+                }
             }
         })
             .catch((error) => {

package/lib/config/use/UseGuide.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-ignore
 const index_vue_1 = __importDefault(require("../../components/base/baseGuide/index.vue"));
 const DynamicMountClass_1 = __importDefault(require("../../components/dynamicmount/DynamicMountClass"));
-const vue_1 = __importDefault(require("vue"));
+const componentConfig_1 = __importDefault(require("../componentConfig"));
 class UseGuide {
     constructor() {
         this.guideComponent = null;
@@ -18,7 +18,7 @@ class UseGuide {
                 componentProps: Object.assign({}, params),
             });
             this.guideComponent.on('mounted', (component) => {
-                vue_1.default.nextTick(() => {
+                componentConfig_1.default.Vue.nextTick(() => {
                     component.guideControl.onStartGuide();
                 });
             });

package/lib/config/use/UseImg.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-ignore
 const image_viewer_vue_1 = __importDefault(require("../../components/base/baseImageViewer/image-viewer.vue"));
 const DynamicMountClass_1 = __importDefault(require("../../components/dynamicmount/DynamicMountClass"));
-const vue_1 = __importDefault(require("vue"));
+const componentConfig_1 = __importDefault(require("../componentConfig"));
 class UseImg {
     constructor() {
         this.dynamicMount = null;
@@ -15,7 +15,7 @@ class UseImg {
         if (this.dynamicMount) {
             this.destroy();
         }
-        vue_1.default.nextTick(() => {
+        componentConfig_1.default.Vue.nextTick(() => {
             this.dynamicMount = new DynamicMountClass_1.default({
                 componentProps: {
                     urlList: list,

package/lib/config/use/UseUpload.d.ts

@@ -4,7 +4,7 @@ declare class UseUpload implements UseUploadInterFace {
     dynamicMount: DynamicMountInterface | null;
     lock: Boolean;
     constructor();
-    toUpload(uploadList: any, cb: any): void;
+    toUpload(uploadList: any, cb: any, isOss: any): boolean;
     uploadEd(evt?: null): void;
     appendUploadItem(list: any): void;
 }

package/lib/config/use/UseUpload.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UseUpload.d.ts","sourceRoot":"","sources":["../../../packages/config/use/UseUpload.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,qBAAqB,EAAE,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAG7E,cAAM,SAAU,YAAW,kBAAkB;IACzC,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,YAAY,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC3C,IAAI,EAAE,OAAO,CAAC;;IAQd,QAAQ,CAAC,UAAU,KAAA,EAAE,EAAE,KAAA;IA2BvB,QAAQ,CAAC,GAAG,OAAO;IAmBnB,gBAAgB,CAAC,IAAI,KAAA;CAYxB;AAED,QAAA,IAAI,SAAS,WAAkB,CAAA;AAE/B,eAAe,SAAS,CAAA"}
+{"version":3,"file":"UseUpload.d.ts","sourceRoot":"","sources":["../../../packages/config/use/UseUpload.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,qBAAqB,EAAE,kBAAkB,EAAC,MAAM,oBAAoB,CAAC;AAG7E,cAAM,SAAU,YAAW,kBAAkB;IACzC,MAAM,EAAE,GAAG,EAAE,CAAC;IACd,YAAY,EAAE,qBAAqB,GAAG,IAAI,CAAC;IAC3C,IAAI,EAAE,OAAO,CAAC;;IAQd,QAAQ,CAAC,UAAU,KAAA,EAAE,EAAE,KAAA,EAAE,KAAK,KAAA;IA8B9B,QAAQ,CAAC,GAAG,OAAO;IAmBnB,gBAAgB,CAAC,IAAI,KAAA;CAYxB;AAED,QAAA,IAAI,SAAS,WAAkB,CAAA;AAE/B,eAAe,SAAS,CAAA"}

package/lib/config/use/UseUpload.js

@@ -6,18 +6,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-ignore
 const upload_vue_1 = __importDefault(require("../../components/base/upload/upload.vue"));
 const DynamicMountClass_1 = __importDefault(require("../../components/dynamicmount/DynamicMountClass"));
-const vue_1 = __importDefault(require("vue"));
+const componentConfig_1 = __importDefault(require("../componentConfig"));
 class UseUpload {
     constructor() {
         this.cbList = [];
         this.dynamicMount = null;
         this.lock = false;
     }
-    toUpload(uploadList, cb) {
+    toUpload(uploadList, cb, isOss) {
         // componentConfig.setUploadUrl(0, 1);
         if (this.lock) {
-            vue_1.default.prototype.$message.error('请等待上传完成后，再上传');
-            return;
+            componentConfig_1.default.Vue.prototype.$message.error('请等待上传完成后，再上传');
+            return false;
         }
         if (cb) {
             this.cbList.push({ cb, uploadList });
@@ -31,12 +31,14 @@ class UseUpload {
                     uploadEdEvent: (evt) => {
                         this.uploadEd(evt);
                     },
+                    isOss: isOss,
                     toUploadList: uploadList,
                 },
                 vueComponent: upload_vue_1.default,
             });
             this.dynamicMount.init();
         }
+        return true;
     }
     uploadEd(evt = null) {
         this.lock = true;