@peng_kai/kit 0.2.46 → 0.2.48

package/package.json

@@ -1,95 +1,95 @@
-{
-  "name": "@peng_kai/kit",
-  "type": "module",
-  "version": "0.2.46",
-  "description": "",
-  "author": "",
-  "license": "ISC",
-  "keywords": [],
-  "main": "index.js",
-  "scripts": {
-    "dev:js": "tsx ./admin/scripts/deploy.ts",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix"
-  },
-  "peerDependencies": {
-    "ant-design-vue": "4.2.3",
-    "vue": "3.4.31",
-    "vue-router": "4.4.0"
-  },
-  "dependencies": {
-    "@aws-sdk/client-s3": "^3.609.0",
-    "@aws-sdk/lib-storage": "^3.609.0",
-    "@babel/generator": "^7.24.7",
-    "@babel/parser": "^7.24.7",
-    "@babel/traverse": "^7.24.7",
-    "@babel/types": "^7.24.7",
-    "@ckeditor/ckeditor5-vue": "^5.1.0",
-    "@fingerprintjs/fingerprintjs": "^4.4.1",
-    "@tanstack/vue-query": "^5.49.1",
-    "@vueuse/components": "^10.11.0",
-    "@vueuse/core": "^10.11.0",
-    "@vueuse/router": "^10.11.0",
-    "a-calc": "^1.3.12",
-    "archiver": "^7.0.1",
-    "axios": "^1.7.2",
-    "bignumber.js": "^9.1.2",
-    "chokidar": "^3.6.0",
-    "crypto-es": "^2.1.0",
-    "dayjs": "^1.11.11",
-    "echarts": "^5.4.3",
-    "execa": "^9.3.0",
-    "fast-glob": "^3.3.2",
-    "localstorage-slim": "^2.7.1",
-    "lodash-es": "^4.17.21",
-    "nprogress": "^0.2.0",
-    "pinia": "^2.1.7",
-    "tsx": "^4.16.00",
-    "vue": "^3.4.31",
-    "vue-i18n": "^9.13.1",
-    "vue-router": "^4.4.0"
-  },
-  "devDependencies": {
-    "@ckeditor/ckeditor5-adapter-ckfinder": "^41.1.0",
-    "@ckeditor/ckeditor5-alignment": "^41.1.0",
-    "@ckeditor/ckeditor5-autoformat": "^41.1.0",
-    "@ckeditor/ckeditor5-basic-styles": "^41.1.0",
-    "@ckeditor/ckeditor5-block-quote": "^41.1.0",
-    "@ckeditor/ckeditor5-build-classic": "^41.1.0",
-    "@ckeditor/ckeditor5-code-block": "^41.1.0",
-    "@ckeditor/ckeditor5-document-outline": "^41.1.0",
-    "@ckeditor/ckeditor5-editor-classic": "^41.1.0",
-    "@ckeditor/ckeditor5-essentials": "^41.1.0",
-    "@ckeditor/ckeditor5-font": "^41.1.0",
-    "@ckeditor/ckeditor5-heading": "^41.1.0",
-    "@ckeditor/ckeditor5-highlight": "^41.1.0",
-    "@ckeditor/ckeditor5-horizontal-line": "^41.1.0",
-    "@ckeditor/ckeditor5-html-embed": "^41.1.0",
-    "@ckeditor/ckeditor5-html-support": "^41.1.0",
-    "@ckeditor/ckeditor5-image": "^41.1.0",
-    "@ckeditor/ckeditor5-import-word": "^41.1.0",
-    "@ckeditor/ckeditor5-indent": "^41.1.0",
-    "@ckeditor/ckeditor5-link": "^41.1.0",
-    "@ckeditor/ckeditor5-list": "^41.1.0",
-    "@ckeditor/ckeditor5-media-embed": "^41.1.0",
-    "@ckeditor/ckeditor5-paragraph": "^41.1.0",
-    "@ckeditor/ckeditor5-remove-format": "^41.1.0",
-    "@ckeditor/ckeditor5-show-blocks": "^41.1.0",
-    "@ckeditor/ckeditor5-source-editing": "^41.1.0",
-    "@ckeditor/ckeditor5-table": "^41.1.0",
-    "@ckeditor/ckeditor5-theme-lark": "^41.1.0",
-    "@ckeditor/ckeditor5-typing": "^41.1.0",
-    "@ckeditor/ckeditor5-upload": "^41.1.0",
-    "@ckeditor/ckeditor5-word-count": "^41.1.0",
-    "@peng_kai/lint": "^0.1.0",
-    "@types/archiver": "^6.0.2",
-    "@types/crypto-js": "^4.2.2",
-    "@types/lodash-es": "^4.17.12",
-    "@types/node": "^18.19.39",
-    "@types/nprogress": "^0.2.3",
-    "ant-design-vue": "^4.2.3",
-    "type-fest": "^4.21.0",
-    "typescript": "^5.5.3",
-    "vue-component-type-helpers": "^2.0.24"
-  }
-}
+{
+  "name": "@peng_kai/kit",
+  "type": "module",
+  "version": "0.2.48",
+  "description": "",
+  "author": "",
+  "license": "ISC",
+  "keywords": [],
+  "main": "index.js",
+  "scripts": {
+    "dev:js": "tsx ./admin/scripts/deploy.ts",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix"
+  },
+  "peerDependencies": {
+    "ant-design-vue": "4.2.3",
+    "vue": "3.4.31",
+    "vue-router": "4.4.0"
+  },
+  "dependencies": {
+    "@aws-sdk/client-s3": "^3.609.0",
+    "@aws-sdk/lib-storage": "^3.609.0",
+    "@babel/generator": "^7.24.7",
+    "@babel/parser": "^7.24.7",
+    "@babel/traverse": "^7.24.7",
+    "@babel/types": "^7.24.7",
+    "@ckeditor/ckeditor5-vue": "^5.1.0",
+    "@fingerprintjs/fingerprintjs": "^4.4.1",
+    "@tanstack/vue-query": "^5.49.1",
+    "@vueuse/components": "^10.11.0",
+    "@vueuse/core": "^10.11.0",
+    "@vueuse/router": "^10.11.0",
+    "a-calc": "^1.3.12",
+    "archiver": "^7.0.1",
+    "axios": "^1.7.2",
+    "bignumber.js": "^9.1.2",
+    "chokidar": "^3.6.0",
+    "crypto-es": "^2.1.0",
+    "dayjs": "^1.11.11",
+    "echarts": "^5.4.3",
+    "execa": "^9.3.0",
+    "fast-glob": "^3.3.2",
+    "localstorage-slim": "^2.7.1",
+    "lodash-es": "^4.17.21",
+    "nprogress": "^0.2.0",
+    "pinia": "^2.1.7",
+    "tsx": "^4.16.00",
+    "vue": "^3.4.31",
+    "vue-i18n": "^9.13.1",
+    "vue-router": "^4.4.0"
+  },
+  "devDependencies": {
+    "@ckeditor/ckeditor5-adapter-ckfinder": "^41.1.0",
+    "@ckeditor/ckeditor5-alignment": "^41.1.0",
+    "@ckeditor/ckeditor5-autoformat": "^41.1.0",
+    "@ckeditor/ckeditor5-basic-styles": "^41.1.0",
+    "@ckeditor/ckeditor5-block-quote": "^41.1.0",
+    "@ckeditor/ckeditor5-build-classic": "^41.1.0",
+    "@ckeditor/ckeditor5-code-block": "^41.1.0",
+    "@ckeditor/ckeditor5-document-outline": "^41.1.0",
+    "@ckeditor/ckeditor5-editor-classic": "^41.1.0",
+    "@ckeditor/ckeditor5-essentials": "^41.1.0",
+    "@ckeditor/ckeditor5-font": "^41.1.0",
+    "@ckeditor/ckeditor5-heading": "^41.1.0",
+    "@ckeditor/ckeditor5-highlight": "^41.1.0",
+    "@ckeditor/ckeditor5-horizontal-line": "^41.1.0",
+    "@ckeditor/ckeditor5-html-embed": "^41.1.0",
+    "@ckeditor/ckeditor5-html-support": "^41.1.0",
+    "@ckeditor/ckeditor5-image": "^41.1.0",
+    "@ckeditor/ckeditor5-import-word": "^41.1.0",
+    "@ckeditor/ckeditor5-indent": "^41.1.0",
+    "@ckeditor/ckeditor5-link": "^41.1.0",
+    "@ckeditor/ckeditor5-list": "^41.1.0",
+    "@ckeditor/ckeditor5-media-embed": "^41.1.0",
+    "@ckeditor/ckeditor5-paragraph": "^41.1.0",
+    "@ckeditor/ckeditor5-remove-format": "^41.1.0",
+    "@ckeditor/ckeditor5-show-blocks": "^41.1.0",
+    "@ckeditor/ckeditor5-source-editing": "^41.1.0",
+    "@ckeditor/ckeditor5-table": "^41.1.0",
+    "@ckeditor/ckeditor5-theme-lark": "^41.1.0",
+    "@ckeditor/ckeditor5-typing": "^41.1.0",
+    "@ckeditor/ckeditor5-upload": "^41.1.0",
+    "@ckeditor/ckeditor5-word-count": "^41.1.0",
+    "@peng_kai/lint": "^0.1.0",
+    "@types/archiver": "^6.0.2",
+    "@types/crypto-js": "^4.2.2",
+    "@types/lodash-es": "^4.17.12",
+    "@types/node": "^18.19.39",
+    "@types/nprogress": "^0.2.3",
+    "ant-design-vue": "^4.2.3",
+    "type-fest": "^4.21.0",
+    "typescript": "^5.5.3",
+    "vue-component-type-helpers": "^2.0.24"
+  }
+}

package/request/interceptors/popupMessage.ts

@@ -43,7 +43,7 @@ export function popupMessage(popup: (type: 'error' | 'success', message: string)
         errorMsg = error.message;
       }
 
-      if (typeof errorMsg === 'string' && errorMsg !== '')
+      if (typeof errorMsg === 'string' && (errorMsg !== '' && errorMsg !== 'canceled'))
         popup('error', errorMsg);
 
       throw error;

package/vue/components/echarts/src/ECharts.vue

@@ -1,31 +1,75 @@
 <script lang="ts">
 import { useEventListener, useResizeObserver } from '@vueuse/core';
 import * as echarts from 'echarts';
-import { ref, shallowRef, toRef, watchEffect } from 'vue';
+import { onBeforeMount, onMounted, ref, shallowRef, toRef, watch } from 'vue';
 import { useIsDark } from '../../../hooks/useIsDark';
 </script>
 
 <script setup lang="ts">
-const props = defineProps<{
+const props = withDefaults(defineProps<{
   echartOption: any
-}>();
+  theme?: 'light' | 'dark' | 'auto'
+  updateMode?: 'all' | 'data'
+}>(), {
+  theme: 'auto',
+  updateMode: 'all',
+});
 
 const $chartEle = ref<HTMLElement>();
-const echartInst = shallowRef<echarts.ECharts>();
+const echartInst = shallowRef<echarts.ECharts | null>(null);
 const isDark = useIsDark();
 
-watchEffect(() => {
-  const _$chartEle = $chartEle.value;
+// watchEffect(() => {
+//   const _$chartEle = $chartEle.value;
 
-  if (!_$chartEle) {
-    echartInst.value = undefined;
-    return;
-  }
+//   if (!_$chartEle) {
+//     echartInst.value = undefined;
+//     return;
+//   }
+
+//   // TODO: [ECharts] Can't get DOM width or height. Please check dom.clientWidth and dom.clientHeight. They should not be 0.For example, you may need to call this in the callback of window.onload.
+//   echartInst.value = echarts.init(_$chartEle, isDark.value ? 'dark' : 'light');
+//   echartInst.value.setOption(props.echartOption ?? {});
+//   // echartInst.value
+// });
+
+function getTheme() {
+  if (props.theme === 'auto')
+    return isDark.value ? 'dark' : 'light';
+
+  return props.theme;
+}
+
+function updateAll(option: any) {
+  echartInst.value?.dispose();
+  echartInst.value = null;
+  echartInst.value = echarts.init($chartEle.value, getTheme());
+  echartInst.value.setOption(option ?? {});
+}
+
+function updateData(option: any) {
+  echartInst.value?.setOption(option ?? {});
+}
+
+watch(toRef(props, 'echartOption'), (option) => {
+  if (props.updateMode === 'all')
+    updateAll(option);
+  else
+    updateData(option);
+});
+
+watch(isDark, () => {
+  if (props.theme === 'auto')
+    updateAll(props.echartOption);
+});
+
+onMounted(() => {
+  updateAll(props.echartOption ?? {});
+});
 
-  // TODO: [ECharts] Can't get DOM width or height. Please check dom.clientWidth and dom.clientHeight. They should not be 0.For example, you may need to call this in the callback of window.onload.
+onBeforeMount(() => {
   echartInst.value?.dispose();
-  echartInst.value = echarts.init(_$chartEle, isDark.value ? 'dark' : 'light');
-  echartInst.value.setOption(props.echartOption ?? {});
+  echartInst.value = null;
 });
 
 /**

package/vue/hooks/useSyncModalParams.ts

@@ -29,7 +29,7 @@ export function parseModalParams<T = any>(modalName?: string, hash?: string) {
  * @param modalParams 弹窗参数
  */
 export function useSyncModalParamsToHash(modalName: string, modalParams: Record<string, any>) {
-  const hashStr = useRouteHash(undefined, { route: useRoute(), router: useRouter() });
+  const hashStr = useRouteHash(undefined, { route: useRoute(), router: useRouter(), mode: 'replace' });
 
   function syncParamsToHash() {
     const _hashStr = hashStr.value ?? '';
@@ -55,7 +55,7 @@ export function useSyncModalParamsToHash(modalName: string, modalParams: Record<
     if (!hashParams.get(MODAL_NAME_KEY) || hashParams.get(MODAL_NAME_KEY) === modalName) {
       hashParams.delete(MODAL_NAME_KEY);
       Object.keys(modalParams).forEach(k => hashParams.delete(k));
-      hashStr.value = `#${hashParams.toString()}`;
+      location.hash = `#${hashParams.toString()}`;
     }
   }