fix(table) error

fix(table) error fix(package) version

Author: dirkhe1051931999

.vscode/extensions.json

@@ -20,42 +20,42 @@
  "@fullcalendar/vue3": "^5.11.3",
  "@quasar/extras": "^1.0.0",
  "axios": "1.6.0",
- "chart.js": "^4.0.1",
+ "chart.js": "^4.4.2",
  "codemirror": "^5.56.0",
  "core-js": "^3.6.5",
  "echarts": "^5.4.0",
  "echarts-liquidfill": "^3.1.0",
- "element-plus": "^2.2.20",
+ "element-plus": "^2.6.3",
  "js-cookie": "^3.0.1",
  "jsencrypt": "^3.2.1",
  "json-editor-vue": "^0.9.2",
  "marked": "4.0.10",
  "path-browserify": "^1.0.1",
  "path-to-regexp": "^6.2.1",
  "prismjs": "^1.29.0",
- "quasar": "^2.14.2",
+ "quasar": "^2.15.2",
  "sass.js": "^0.11.1",
  "sha256": "^0.2.0",
  "shepherd.js": "^11.0.1",
  "ts-md5": "^1.2.7",
  "uuid": "^9.0.0",
  "vanilla-jsoneditor": "^0.9.2",
  "vue": "^3.2.29",
- "vue-facing-decorator": "^3.0.3",
+ "vue-facing-decorator": "^3.0.4",
  "vue-i18n": "^9.3.0-beta.6",
  "vue-router": "^4.1.6",
  "vue-shepherd": "^2.0.1",
  "vue3-count-to": "^1.1.2",
  "vue3-photo-preview": "^0.2.6",
  "vue3-side-panel": "^1.1.1",
- "vuex": "^4.0.1",
+ "vuex": "^4.1.0",
  "xterm": "^5.1.0",
  "xterm-addon-attach": "^0.8.0",
  "xterm-addon-fit": "^0.7.0"
  },
  "devDependencies": {
- "@quasar/app-webpack": "^3.0.0",
- "@types/chart.js": "^2.9.37",
+ "@quasar/app-webpack": "^3.12.4",
+ "@types/chart.js": "^2.9.41",
  "@types/codemirror": "0.0.97",
  "@types/js-cookie": "^3.0.2",
  "@types/node": "^12.20.21",
@@ -66,7 +66,6 @@
  "autoprefixer": "^10.4.2",
  "browserslist": "^4.21.9",
  "caniuse-lite": "^1.0.30001517",
- "clean-webpack-plugin": "^4.0.0",
  "cross-env": "^7.0.3",
  "eslint": "^8.10.0",
  "eslint-config-prettier": "^8.1.0",
@@ -92,8 +91,8 @@
  "last 5 Opera versions"
  ],
  "engines": {
- "node": ">= 12.22.1",
- "npm": ">= 6.13.4",
- "yarn": ">= 1.21.1"
+ "node": ">= 18.16.0",
+ "npm": ">= 9.5.1",
+ "yarn": ">= 1.22.19"
  }
 }

.vscode/settings.json

@@ -12,7 +12,6 @@
 
 const { configure } = require('quasar/wrappers');
 const setting = require('./src/setting.json');
-const { CleanWebpackPlugin } = require('clean-webpack-plugin');
 const multiplePage = require('./multiple.page.generate');
 const path = require('path');
 
@@ -86,9 +85,6 @@ module.exports = configure((ctx) => {
  chainWebpack(/* chain */) {},
  extendWebpack(cfg) {
  // linting is slow in TS projects, we execute it only for production builds
- if (ctx.prod) {
- cfg.plugins.push(new CleanWebpackPlugin());
- }
  cfg.resolve.alias = {
  ...cfg.resolve.alias,
  src2: path.resolve(__dirname, './src2'),

package.json

@@ -6,6 +6,8 @@ import vue3PhotoPreview from 'vue3-photo-preview';
 import 'vue3-photo-preview/dist/index.css';
 import globalMessage from 'src/utils/notify';
 import globalConfirm from 'src/utils/dialogConfirm';
+// import 'element-plus/dist/index.css';
+import 'element-plus/theme-chalk/dark/css-vars.css';
 import 'src/utils/types';
 import VueSidePanel from 'vue3-side-panel';
 import 'vue3-side-panel/dist/vue3-side-panel.css';

public/icons/svg/reset-query.svg

@@ -11,6 +11,9 @@
  <slot />
  </q-form>
  </div>
+ <div class="q-px-md q-pb-md">
+ <slot name="extra-description" />
+ </div>
  <div class="split-line h-1"></div>
  <div class="text-center q-pa-md row justify-end">
  <q-btn :label="$t(`action.cancel`)" :disable="myDialogParams.clickLoading" @click="handlerClickCancel()" outline color="primary" />
@@ -125,25 +128,25 @@ export default class MyDialogComponent extends Vue {
  }
 
  created() {
- this.myDialogParams = cloneDeep(Object.assign(DEFAULT_OPTION, this.option));
+ this.myDialogParams = Object.assign(cloneDeep(DEFAULT_OPTION), cloneDeep(this.option));
  this.bakParams = cloneDeep(this.option.params);
  this.prevOption = cloneDeep(this.option);
  }
 
  private globals = getCurrentInstance()!.appContext.config.globalProperties;
  private bakParams = {};
  private prevOption: IOption | undefined;
- private myDialogParams = cloneDeep(DEFAULT_OPTION);
+ public myDialogParams = cloneDeep(DEFAULT_OPTION);
 
  /* event */
  public handlerClickCancel() {
  this.$nextTick(() => {
  this.$emit('close', { type: this.myDialogParams.dialogType });
- this.$refs[this.myDialogParams.id].resetValidation();
+ this.$refs[this.myDialogParams.id] && this.$refs[this.myDialogParams.id].resetValidation();
  });
  }
 
- private handlerClickDialogConfirmButton() {
+ public handlerClickDialogConfirmButton() {
  if (!this.option.customComfirm) {
  this.$refs[this.myDialogParams.id].validate().then(async (valid: boolean) => {
  if (valid) {
@@ -167,7 +170,7 @@ export default class MyDialogComponent extends Vue {
  }
  }
 
- private handlerBeforeHide() {
+ public handlerBeforeHide() {
  this.myDialogParams.params = cloneDeep(this.bakParams);
  this.$emit('before-hide', {
  type: this.myDialogParams.dialogType,
@@ -221,8 +224,7 @@ export default class MyDialogComponent extends Vue {
  }
 
  .content {
- padding: 0 16px;
- margin: 10px 0;
+ padding: 16px;
  }
 }
 </style>