yvan 2 anni fa
parent
commit
cd06fa745b
2 ha cambiato i file con 13 aggiunte e 17 eliminazioni
  1. 12 16
      dist/yvan-ext.js
  2. 1 1
      dist/yvan-ext.js.map

+ 12 - 16
dist/yvan-ext.js

@@ -5346,19 +5346,6 @@ define(['exports', 'axios', 'qs', 'lodash', 'jquery', 'moment', 'recast', 'xlsx'
             console.error(msg, e);
         });
     }
-    function columnDomainInit() {
-        getColumnDomainApi({}).then(function (res) {
-            if (res.success) {
-                var tt = _$2.map(res.data, function (row) {
-                    return {
-                        text: row.domain_name,
-                        id: row.domain_id,
-                    };
-                });
-                _$2.set(window, 'DICT_CACHE.column_domain', tt);
-            }
-        });
-    }
     var baseUrl = "/api/com/yvan/studio/FileManager";
     var layoutUrl = "/api/com/yvan/studio/LayoutManager";
     function getBaseUrl() {
@@ -6647,6 +6634,15 @@ define(['exports', 'axios', 'qs', 'lodash', 'jquery', 'moment', 'recast', 'xlsx'
                 getColumnDomainApi()
                     .then(function (res) {
                     if (res.success) {
+                        if (res.success) {
+                            var tt = _$2.map(res.data, function (row) {
+                                return {
+                                    text: row.domain_name,
+                                    id: row.domain_id,
+                                };
+                            });
+                            _$2.set(window, 'DICT_CACHE.column_domain', tt);
+                        }
                         columnDomain = res.data;
                         resolve(res.data);
                     }
@@ -25279,7 +25275,7 @@ define(['exports', 'axios', 'qs', 'lodash', 'jquery', 'moment', 'recast', 'xlsx'
         __extends(ReportScope, _super);
         function ReportScope(_a, invokeServerFn) {
             var model = _a.model, vjson = _a.vjson;
-            var _this = _super.call(this, { model: model, vjson: vjson }) || this;
+            var _this = _super.call(this, { model: model, vjson: vjson, i18n: null }) || this;
             _this.invokeServerFn = invokeServerFn;
             return _this;
         }
@@ -32740,7 +32736,8 @@ define(['exports', 'axios', 'qs', 'lodash', 'jquery', 'moment', 'recast', 'xlsx'
         window['native'] = native;
         native.init();
         init();
-        columnDomainInit();
+        instance.getAllDomain().finally(function () {
+        });
         initStateTree();
         initDashboard();
         initFileTree();
@@ -32766,7 +32763,6 @@ define(['exports', 'axios', 'qs', 'lodash', 'jquery', 'moment', 'recast', 'xlsx'
         initMonitorTree();
         initHomeTree();
     }
-    //# sourceMappingURL=init.js.map
 
     var studio = {
         init: init$2,

File diff suppressed because it is too large
+ 1 - 1
dist/yvan-ext.js.map