@fairys/taro-tools-react 1.0.29 → 1.0.31

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (7) hide show
  1. package/esm/context/global.message.data.instance.js +2 -3
  2. package/esm/context/page.info.data.instance.js +1 -1
  3. package/lib/context/global.message.data.instance.js +2 -3
  4. package/lib/context/page.info.data.instance.js +1 -1
  5. package/package.json +1 -1
  6. package/src/context/global.message.data.instance.ts +1 -4
  7. package/src/context/page.info.data.instance.tsx +1 -1
package/esm/context/global.message.data.instance.js CHANGED
@@ -58,13 +58,12 @@ class GlobalMessageDataInstance extends ProxyInstanceObjectBase {
58
58
  const f = this.onBeforetToLoginPage();
59
59
  if (false === f) return;
60
60
  }
61
- const currentPath = taro.getCurrentInstance().router?.path || '';
62
61
  const loginPageRoute = globalSettingDataInstance.store.loginPageRoute || '';
63
62
  const isLoginPage = utils_navigate.isCurrentPage(loginPageRoute || '');
64
63
  const _loginPageRoute = `${loginPageRoute || ''}`.replace(/^\//, '');
65
64
  if (isLoginPage) return;
66
- utils_navigate.navigateTo({
67
- url: `/${_loginPageRoute}?redirect=${currentPath}`
65
+ taro.navigateTo({
66
+ url: `/${_loginPageRoute}`
68
67
  });
69
68
  };
70
69
  }
package/esm/context/page.info.data.instance.js CHANGED
@@ -84,7 +84,7 @@ class page_info_data_instance_PageInfoDataInstance extends ProxyInstanceObjectBa
84
84
  taro.hideLoading();
85
85
  };
86
86
  main_saveInfo = async ()=>{
87
- if (this.requestSaveInfoConfig?.onSaveInfo) return void console.error("\u672A\u914D\u7F6E requestSaveInfoConfig.onSaveInfo \u8BF7\u6C42\u65B9\u6CD5");
87
+ if (!this.requestSaveInfoConfig?.onSaveInfo) return void console.error("\u672A\u914D\u7F6E requestSaveInfoConfig.onSaveInfo \u8BF7\u6C42\u65B9\u6CD5");
88
88
  try {
89
89
  this.updatedLoading(true);
90
90
  taro.showLoading({
package/lib/context/global.message.data.instance.js CHANGED
@@ -99,13 +99,12 @@ class GlobalMessageDataInstance extends instance_js_namespaceObject.ProxyInstanc
99
99
  const f = this.onBeforetToLoginPage();
100
100
  if (false === f) return;
101
101
  }
102
- const currentPath = taro_default().getCurrentInstance().router?.path || '';
103
102
  const loginPageRoute = external_global_setting_data_instance_js_namespaceObject.globalSettingDataInstance.store.loginPageRoute || '';
104
103
  const isLoginPage = navigate_js_default().isCurrentPage(loginPageRoute || '');
105
104
  const _loginPageRoute = `${loginPageRoute || ''}`.replace(/^\//, '');
106
105
  if (isLoginPage) return;
107
- navigate_js_default().navigateTo({
108
- url: `/${_loginPageRoute}?redirect=${currentPath}`
106
+ taro_default().navigateTo({
107
+ url: `/${_loginPageRoute}`
109
108
  });
110
109
  };
111
110
  }
package/lib/context/page.info.data.instance.js CHANGED
@@ -128,7 +128,7 @@ class page_info_data_instance_PageInfoDataInstance extends instance_js_namespace
128
128
  taro_default().hideLoading();
129
129
  };
130
130
  main_saveInfo = async ()=>{
131
- if (this.requestSaveInfoConfig?.onSaveInfo) return void console.error("\u672A\u914D\u7F6E requestSaveInfoConfig.onSaveInfo \u8BF7\u6C42\u65B9\u6CD5");
131
+ if (!this.requestSaveInfoConfig?.onSaveInfo) return void console.error("\u672A\u914D\u7F6E requestSaveInfoConfig.onSaveInfo \u8BF7\u6C42\u65B9\u6CD5");
132
132
  try {
133
133
  this.updatedLoading(true);
134
134
  taro_default().showLoading({
package/package.json CHANGED
@@ -3,7 +3,7 @@
3
3
  "author": "SunLxy <1011771396@qq.com>",
4
4
  "description": "框架组件库",
5
5
  "homepage": "https://github.com/autumn-fairy-tales/fairys-taro-react",
6
- "version": "1.0.29",
6
+ "version": "1.0.31",
7
7
  "main": "esm/index.js",
8
8
  "types": "esm/index.d.ts",
9
9
  "module": "esm/index.js",
package/src/context/global.message.data.instance.ts CHANGED
@@ -101,9 +101,6 @@ export class GlobalMessageDataInstance extends ProxyInstanceObjectBase<GlobalMes
101
101
  return;
102
102
  }
103
103
  }
104
- // 当前路由
105
- const currentPath = Taro.getCurrentInstance().router?.path || '';
106
-
107
104
  const loginPageRoute = globalSettingDataInstance.store.loginPageRoute || '';
108
105
  const isLoginPage = navigate.isCurrentPage(loginPageRoute || '');
109
106
  const _loginPageRoute = `${loginPageRoute || ''}`.replace(/^\//, '');
@@ -112,7 +109,7 @@ export class GlobalMessageDataInstance extends ProxyInstanceObjectBase<GlobalMes
112
109
  return;
113
110
  }
114
111
  // 跳转登录页面
115
- navigate.navigateTo({ url: `/${_loginPageRoute}?redirect=${currentPath}` });
112
+ Taro.navigateTo({ url: `/${_loginPageRoute}` });
116
113
  };
117
114
  }
118
115
  /**
package/src/context/page.info.data.instance.tsx CHANGED
@@ -138,7 +138,7 @@ export class PageInfoDataInstance<
138
138
 
139
139
  /**保存数据*/
140
140
  main_saveInfo = async () => {
141
- if (this.requestSaveInfoConfig?.onSaveInfo) {
141
+ if (!this.requestSaveInfoConfig?.onSaveInfo) {
142
142
  console.error('未配置 requestSaveInfoConfig.onSaveInfo 请求方法');
143
143
  return;
144
144
  }