From a47e76325462cc7f323199a9ce133a895a4c3fda Mon Sep 17 00:00:00 2001
From: ln1778 <465410291@qq.com>
Date: Thu, 20 Jun 2024 15:53:30 +0800
Subject: [PATCH] 222

---
 dict/index.js | 87 ++++++++++++++++++++++++++-------------------------
 package.json  |  2 +-
 2 files changed, 46 insertions(+), 43 deletions(-)

diff --git a/dict/index.js b/dict/index.js
index f661ae1..18df17f 100644
--- a/dict/index.js
+++ b/dict/index.js
@@ -10,7 +10,7 @@ export default function (Vue, options) {
         return {}
       }
      
-      const dict = new Dict();
+      const dict = new Dict(this.$options.dictapiurl);
       if(this.$options.dictapiurl){
         apiurl=this.$options.dictapiurl;
         dict.apiurl=this.$options.dictapiurl;
@@ -29,11 +29,13 @@ export default function (Vue, options) {
       if (!(this.dict instanceof Dict)) {
         return
       }
-  
+      if(this.$options.dictapiurl){ 
+        this.dict.apiurl=this.$options.dictapiurl;
+      } 
       let dicttime=sessionStorage.getItem("dicttime");  
       if(dicttime&&new Date().getTime()-Number(dicttime)>1000*60*720){
-        options.onCreated && options.onCreated(this.dict)
-        this.dict.init(this.$options.dicts,this.$options.dictapiurl).then(() => {
+        options.onCreated && options.onCreated(this.dict) 
+        this.dict.init(this.$options.dicts).then(() => {
           this.dictstatus = true; 
           sessionStorage.setItem("dicttime",new Date().getTime());
           options.onReady && options.onReady(this.dict)
@@ -45,22 +47,43 @@ export default function (Vue, options) {
             }
           })
         })
-      }
-
-      const dictdata = sessionStorage.getItem("dictdata");
-      if (dictdata) {
-        let sedata = JSON.parse(dictdata); 
-        const find=this.$options.dicts.find((f)=>{
-          let findchild=Object.keys(sedata).find((h)=>h.indexOf(f)>-1); 
-          return !findchild;
-        });  
-        if(find){
+      }else{
+        const dictdata = sessionStorage.getItem("dictdata");
+        if (dictdata) {
+          let sedata = JSON.parse(dictdata); 
+          const find=this.$options.dicts.find((f)=>{
+            let findchild=Object.keys(sedata).find((h)=>h.indexOf(f)>-1); 
+            return !findchild;
+          });  
+          if(find){
+            options.onCreated && options.onCreated(this.dict)
+            this.dict.init(this.$options.dicts).then(() => {
+              this.dictstatus = true; 
+              sessionStorage.setItem("dicttime",new Date().getTime());
+              options.onReady && options.onReady(this.dict)
+         
+              this.$nextTick(() => {
+                this.$emit('dictReady', this.dict) 
+                if (this.$options.methods && this.$options.methods.onDictReady instanceof Function) {
+                  this.$options.methods.onDictReady.call(this, this.dict)
+    
+                }
+              })
+            })
+          }else{ 
+            this.dict.doSession(sedata).then(() => { 
+              this.dictstatus = true; 
+              this.$nextTick(() => {
+                this.$emit('dictReady', this.dict) 
+              })
+            });
+          } 
+        } else {
           options.onCreated && options.onCreated(this.dict)
           this.dict.init(this.$options.dicts).then(() => {
-            this.dictstatus = true; 
+            this.dictstatus = true;
             sessionStorage.setItem("dicttime",new Date().getTime());
             options.onReady && options.onReady(this.dict)
-       
             this.$nextTick(() => {
               this.$emit('dictReady', this.dict) 
               if (this.$options.methods && this.$options.methods.onDictReady instanceof Function) {
@@ -69,30 +92,8 @@ export default function (Vue, options) {
               }
             })
           })
-        }else{ 
-          this.dict.doSession(sedata).then(() => { 
-            this.dictstatus = true;
-
-            this.$nextTick(() => {
-              this.$emit('dictReady', this.dict) 
-            })
-          });
-        } 
-      } else {
-        options.onCreated && options.onCreated(this.dict)
-        this.dict.init(this.$options.dicts,this.$options.dictapiurl).then(() => {
-          this.dictstatus = true;
-          sessionStorage.setItem("dicttime",new Date().getTime());
-          options.onReady && options.onReady(this.dict)
-          this.$nextTick(() => {
-            this.$emit('dictReady', this.dict) 
-            if (this.$options.methods && this.$options.methods.onDictReady instanceof Function) {
-              this.$options.methods.onDictReady.call(this, this.dict)
-
-            }
-          })
-        })
-      }
+        }
+      } 
     },
 
 
@@ -119,9 +120,11 @@ export default function (Vue, options) {
       },
       getDict(name) {
         new Promise((r)=>{
-          this.dict = new Dict(); 
+          this.dict = new Dict(this.apiurl); 
           this.dict.owner = this;
-          this.dict.apiurl=this.apiurl;
+          if(this.apiurl){
+            this.dict.apiurl=this.apiurl;
+          } 
           this.dict.getDict(name).then(() => {
             r(this.dict); 
           })
diff --git a/package.json b/package.json
index 286f9cd..c85314d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "erp-element-ui",
-  "version": "1.0.43", 
+  "version": "1.0.44", 
   "description": "",
   "main": "index.js",
   "scripts": {