Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

src/App.vue

@@ -29,7 +29,7 @@
       direction="rtl"
       size="80%"
     >
-      <div style="width: 620px">
+      <div style="width: 800px">
         <el-form
           label-width="100px"
           @submit.native.prevent
@@ -219,29 +219,34 @@ export default {
       }
     },
     handleSave() {
-      this.$confirm('确定修改当前页面国际化内容？').then(() => {
-        batchAddOrUpdateFrontInternationalization(this.tableData).then(
-          async (res) => {
-            var zhMessages = {},
-              enMessages = {}
-            var Internationalization = await getFrontInternationalizationList()
-            Vue.prototype.$tl = Internationalization.Result
-            this.tableData.forEach((v) => {
-              // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
-              // enMessages[v.Description + '_' + v.Code] = v.Value
-              zhMessages[v.Code] = v.ValueCN
-              enMessages[v.Code] = v.Value
-            })
-            i18n.mergeLocaleMessage('zh', zhMessages)
-            i18n.mergeLocaleMessage('en', enMessages)
-            this.drawer = false
-            this.$message.success('国际化修改成功')
-            if (this.il8nExternal) {
-              this.$EventBus.$emit('il8nUpdate')
+      this.$confirm('确定修改当前页面国际化内容？')
+        .then(() => {
+          batchAddOrUpdateFrontInternationalization(this.tableData).then(
+            async (res) => {
+              var zhMessages = {},
+                enMessages = {}
+              var Internationalization =
+                await getFrontInternationalizationList()
+              Vue.prototype.$tl = Internationalization.Result
+              this.tableData.forEach((v) => {
+                // zhMessages[v.Description + '_' + v.Code] = v.ValueCN
+                // enMessages[v.Description + '_' + v.Code] = v.Value
+                zhMessages[v.Code] = v.ValueCN
+                enMessages[v.Code] = v.Value
+              })
+              i18n.mergeLocaleMessage('zh', zhMessages)
+              i18n.mergeLocaleMessage('en', enMessages)
+              this.drawer = false
+              this.$message.success('国际化修改成功')
+              if (this.il8nExternal) {
+                this.$EventBus.$emit('il8nUpdate')
+              }
             }
-          }
-        )
-      })
+          )
+        })
+        .catch((err) => {
+          console.log(err)
+        })
     },
     openI18n(ARRAY) {
       this.tableData = []
@@ -268,6 +273,7 @@ export default {
             ValueCN: item.ValueCN,
             State: item.State,
             Version: item.Version,
+            InternationalizationType: item.InternationalizationType,
           }
         })
         this.tableData = Object.assign([], tableData)
@@ -300,6 +306,7 @@ export default {
             ValueCN: null,
             State: 0,
             Version: this.$version.Version,
+            InternationalizationType: 0,
           })
         }
       })

src/views/dictionary/template/browser/tip.vue

@@ -33,7 +33,7 @@ export default {
         let browserType = this.getExplore();
         let type = browserType.split(": ")[0];
         let No = browserType.split(": ")[1].split(".")[0];
-        console.log(type, No);
+        // console.log(type, No);
         if (type !== "Chrome" && type !== "Edge") {
           this.tip = this.$t("browser:tip:changeBorwser");
           return (this.visible = true);

src/views/trials/trials-panel/attachments/reReading-tracking/index.vue

@@ -10,7 +10,7 @@
               v-for="(item,index) of siteOptions"
               :key="index"
               :label="item.TrialSiteCode"
-              :value="item.SiteId"
+              :value="item.TrialSiteId"
             />
           </el-select>
         </el-form-item>

vue.config.js

@@ -4,6 +4,7 @@ const NodePolyfillPlugin = require('node-polyfill-webpack-plugin')
 const WebpackAliyunOss = require('webpack-aliyun-oss')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
+const CopyPlugin = require('copy-webpack-plugin')
 // const TerserWebpackPlugin = require('terser-webpack-plugin')
 const { resolve } = require('path')
 const webpack = require('webpack')
@@ -11,7 +12,7 @@ const defaultSettings = require('./src/settings.js')
 const moment = require('moment')
 var distDate = moment(new Date()).format('YYYY-MM-DD')
 const name = process.env.NODE_ENV === 'usa' ? 'LILI' : defaultSettings.title || 'IRCIS' // page title
-
+const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 // eslint-disable-next-line no-undef
 module.exports = defineConfig({
   // lintOnSave: false,
@@ -83,8 +84,20 @@ module.exports = defineConfig({
       asyncWebAssembly: true
     },
     plugins: [
+      new CopyPlugin({
+        patterns: [
+          {
+            from: resolve(__dirname, './static'),
+            to: resolve(__dirname, './dist/static'),
+            globOptions: {
+              ignore: ['.*']
+            }
 
-      process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? function() { }
+          }
+        ]
+      }),
+      // new BundleAnalyzerPlugin(),
+      process.env.NODE_ENV === 'development' || process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa' ? function () { }
         : new WebpackAliyunOss({
           from: ['./dist/**'],
           dist: process.env.VUE_APP_OSS_PATH + distDate,
@@ -171,7 +184,7 @@ module.exports = defineConfig({
       // 生成文件的最大体积
       maxAssetSize: 3000000000,
       // 只给出js的性能提示
-      assetFilter: function(assetFileName) {
+      assetFilter: function (assetFileName) {
         return assetFileName.endsWith('.js')
       }
     }