@indfnd/common 1.1.6 → 1.1.9

package/CHANGELOG.md

@@ -2,6 +2,29 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [1.1.9](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.1.8...v1.1.9) (2025-09-15)
+
+
+### Bug Fixes
+
+* 修改 ([4cca025](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/4cca025da395a2da46e4f8ab210eb6e6218fd54a))
+* 修改 ([d4713f1](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/d4713f1e264bb9b050ec1b00e6cf5a75245a7eea))
+* 修改 ([2271eb7](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/2271eb7905faf0ae56c68d2882bd726edc4f1b36))
+* 修改 ([d7e116e](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/d7e116ef6407e2cebba681ab7c626fb2f26db7ce))
+* 修改 ([3b64765](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/3b64765792f93703081329f9822e7944bf19de69))
+
+### [1.1.8](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.1.7...v1.1.8) (2025-09-10)
+
+### [1.1.7](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.1.6...v1.1.7) (2025-09-09)
+
+
+### Bug Fixes
+
+* 修改 ([da30870](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/da30870cd5c0de9210c5a542d79c9d2c8298c514))
+* 修改 ([c4ba7e2](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/c4ba7e29513dc2230c0eaa874236b3be007827d0))
+* 修改 ([e63764d](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/e63764dd327fe77f8efbae99d5580405d8d34a6d))
+* 修改 ([58f277f](http://git.inspur.com/imp-ec/ind-front/ind-common-front/commit/58f277fc7a1cf574a88d878fe865f92618b9a58e))
+
 ### [1.1.6](http://git.inspur.com/imp-ec/ind-front/ind-common-front/compare/v1.1.5...v1.1.6) (2025-09-08)
 
 

package/dist/ind-common.es.js

@@ -5460,7 +5460,7 @@ var lodash = { exports: {} };
 })(lodash, lodash.exports);
 var _ = lodash.exports;
 const name$1 = "@indfnd/common";
-const version = "1.1.5";
+const version = "1.1.8";
 const author = "huxuetong";
 const publishConfig = {
   registry: "https://registry.npmjs.org/"
@@ -60895,9 +60895,9 @@ var render$A = function() {
   var _vm = this;
   var _h = _vm.$createElement;
   var _c = _vm._self._c || _h;
-  return _c("div", [_vm.isPc ? _c("div", { staticClass: "ind-loading-panel" }, [_vm._t("default"), _c("div", { staticClass: "custom-overlay", class: { show: _vm.loading }, on: { "click": function($event) {
+  return _c("div", [!_vm.isPc ? _c("div", { staticClass: "ind-loading-panel" }, [_vm._t("default"), _c("div", { staticClass: "custom-overlay", class: { show: _vm.loading }, on: { "click": function($event) {
     $event.stopPropagation();
-  } } }, [_vm.isFullScreenLoading ? _c("div", { staticClass: "ind-loading-wrapper-global" }, [_c("img", { staticStyle: { "height": "100%", "width": "100%" }, attrs: { "src": _vm.getOssFileUrl(_vm.$config.systemDefaultConfig.globalLoading || ""), "alt": "" } }), _c("div", { staticClass: "ind-loading-wrapper-text" }, [_vm._v(" " + _vm._s(_vm.text || "\u7CFB\u7EDF\u52A0\u8F7D\u4E2D...") + " ")])]) : _c("div", { staticClass: "ind-loading-wrapper-local" }, [_c("div", { staticClass: "ind-loading-block ind-vcenter" }, [_c("div", { staticClass: "ind-loading-block-center" }, [_c("img", { attrs: { "src": _vm.getOssFileUrl(_vm.$config.systemDefaultConfig.localLoading || ""), "alt": "" } }), _c("div", { staticClass: "ind-loading-block-text" }, [_vm._v(_vm._s(_vm.text || "\u52A0\u8F7D\u4E2D..."))])])])])])], 2) : _c("div", { staticClass: "ind-loading-panel" }, [_vm._t("default"), _vm.loading ? _c("Spin", { class: ["ind-loading-spin", "ind-loading-spin--" + _vm.theme], style: _vm.style, attrs: { "fix": "" } }, [_c("Icons", { staticClass: "ind-loading-spin-icon", attrs: { "type": "ios-loading", "size": "18" } }), !_vm.noText ? _c("div", [_vm._v(_vm._s(_vm.text))]) : _vm._e()], 1) : _vm._e()], 2)]);
+  } } }, [_vm.isFullScreenLoading && _vm.loadingImageUrl(true) ? _c("div", { staticClass: "ind-loading-wrapper-global" }, [_c("img", { staticStyle: { "height": "100%", "width": "100%" }, attrs: { "src": _vm.loadingImageUrl(true), "alt": "" } }), _c("div", { staticClass: "ind-loading-wrapper-text" }, [_vm._v(" " + _vm._s(_vm.text || "\u7CFB\u7EDF\u52A0\u8F7D\u4E2D...") + " ")])]) : !_vm.isFullScreenLoading && _vm.loadingImageUrl(false) ? _c("div", { staticClass: "ind-loading-wrapper-local" }, [_c("div", { staticClass: "ind-loading-block ind-vcenter" }, [_c("div", { staticClass: "ind-loading-block-center" }, [_c("img", { attrs: { "src": _vm.loadingImageUrl(false), "alt": "" } }), _c("div", { staticClass: "ind-loading-block-text" }, [_vm._v(_vm._s(_vm.text || "\u52A0\u8F7D\u4E2D..."))])])])]) : !_vm.loadingImageUrl(false) ? _c("div", { staticClass: "ind-loading-wrapper-local" }, [_c("div", { staticClass: "ind-loading-block ind-vcenter" }, [_c("div", { staticClass: "ind-loading-block-center" }, [_c("div", { staticClass: "img-divv" }, [_c("Icons", { staticClass: "ind-loading-spin-icon", attrs: { "type": "ios-loading", "size": "18" } })], 1), _c("div", { staticClass: "ind-loading-block-text" }, [_vm._v(_vm._s(_vm.text || "\u52A0\u8F7D\u4E2D..."))])])])]) : _vm._e()])], 2) : _c("div", { staticClass: "ind-loading-panel" }, [_vm._t("default"), _vm.loading ? _c("Spin", { class: ["ind-loading-spin", "ind-loading-spin--" + _vm.theme], style: _vm.style, attrs: { "fix": "" } }, [_c("Icons", { staticClass: "ind-loading-spin-icon", attrs: { "type": "ios-loading", "size": "18" } }), !_vm.noText ? _c("div", [_vm._v(_vm._s(_vm.text))]) : _vm._e()], 1) : _vm._e()], 2)]);
 };
 var staticRenderFns$A = [];
 const __vue2_script$B = {
@@ -60942,13 +60942,20 @@ const __vue2_script$B = {
     }
   },
   methods: {
-    getOssFileUrl(fileId) {
-      console.log(`\u{1F921}\u{1F61D} ... getOssFileUrl ... fileId:`, fileId, this.$config);
-      if (fileId !== "") {
-        console.log("ddddddddddddddddddddddddd");
+    loadingImageUrl(isGlobal) {
+      const configPath = isGlobal ? "systemDefaultConfig.globalLoading" : "systemDefaultConfig.localLoading";
+      const fileId = this.getSafeConfigValue(configPath);
+      if (fileId && fileId.trim() !== "") {
         return `/user-manage-server/oss/file/get/${fileId}`;
       }
-      return this.isFullScreenLoading ? this.defaultGlobal : this.defaultLocal;
+      return false;
+    },
+    getSafeConfigValue(path) {
+      if (!this.$config)
+        return void 0;
+      return path.split(".").reduce((obj, key) => {
+        return obj && obj[key] !== void 0 ? obj[key] : void 0;
+      }, this.$config);
     }
   }
 };
@@ -72333,6 +72340,7 @@ const store = {
   }
 };
 const install = function(Vue2, opts = { theme: "" }) {
+  var _a;
   if (install.installed)
     return;
   if (!location.pathname.includes("scyxweb")) {
@@ -72365,14 +72373,22 @@ const install = function(Vue2, opts = { theme: "" }) {
       Vue2.prototype.$config = _.merge({}, Vue2.prototype.$config || {}, data);
     });
   }
-  axios.get(
-    `/user-manage-server/manage/appSetting/qryAppSettingNew?offset=0&limit=20&settingType=11&deviceType=11`
-  ).then((data) => {
-    var _a, _b;
-    let ret = JSON.parse((_b = (_a = data.data) == null ? void 0 : _a.rows) == null ? void 0 : _b[0].settingInfo);
-    console.log(`\u{1F921}\u{1F61D} ... install ... ret:`, ret);
-    Vue2.prototype.$config = _.merge({}, Vue2.prototype.$config || {}, ret || {});
-  });
+  if (!((_a = Vue2.prototype.$config) == null ? void 0 : _a.systemDefaultConfig)) {
+    axios.get(`/user-manage-server/anon/system/qrySystemConfig`).then((response) => {
+      var _a2;
+      try {
+        const ret = JSON.parse(((_a2 = response == null ? void 0 : response.data) == null ? void 0 : _a2.settingInfo) || "{}");
+        Vue2.prototype.$config = _.merge({}, Vue2.prototype.$config || {}, ret);
+        console.log("\u7CFB\u7EDF\u914D\u7F6E\u5DF2\u52A0\u8F7D", Vue2.prototype.$config);
+      } catch (error) {
+        console.error("\u89E3\u6790 settingInfo \u5931\u8D25:", error);
+      }
+    }).catch((error) => {
+      console.error("\u8BF7\u6C42\u5931\u8D25:", error);
+    });
+  } else {
+    console.log("\u4F7F\u7528\u5DF2\u7F13\u5B58\u7684\u914D\u7F6E", Vue2.prototype.$config);
+  }
   Object.keys(components).forEach((key) => {
     Vue2.component(`Ind${key}`, components[key]);
   });