ananzhusen 3 meses atrás
pai
commit
204fda8483

+ 1 - 2
package.json

@@ -12,12 +12,11 @@
     "@meta2d/activity-diagram": "^1.0.0",
     "@meta2d/chart-diagram": "^1.0.6",
     "@meta2d/class-diagram": "^1.0.1",
-    "@meta2d/core": "^1.0.51",
+    "@meta2d/core": "^1.0.72",
     "@meta2d/flow-diagram": "^1.0.0",
     "@meta2d/form-diagram": "^1.0.8",
     "visio2meta2d":"file:../visio2meta2d",
     "dxf": "file:../dxf",
-    "@2d-components": "file:../2d-components/packages",
     "@meta2d/fta-diagram": "^1.0.0",
     "@meta2d/le5le-charts": "^1.0.3",
     "@meta2d/sequence-diagram": "^1.0.0",

+ 4 - 28
src/views/components/DataSource.vue

@@ -355,12 +355,7 @@
                 </t-dropdown-item>
                 <t-dropdown-item :value="4">
                   <a
-                    :href="
-                      isDownload
-                        ? '/v/data.xlsx'
-                        : cdn
-                        ? cdn + '/v/data.xlsx?r=' + Math.random()
-                        : '/data.xlsx'
+                    :href="'/data.xlsx'
                     "
                     style="color: var(--td-text-color-primary)"
                     @click.stop
@@ -492,13 +487,7 @@
                 </t-dropdown-item>
                 <t-dropdown-item :value="4">
                   <a
-                    :href="
-                      isDownload
-                        ? '/v/data.xlsx'
-                        : cdn
-                        ? cdn + '/v/data.xlsx?r=' + Math.random()
-                        : '/data.xlsx'
-                    "
+                    :href="'/data.xlsx'"
                     style="color: var(--td-text-color-primary)"
                     @click.stop
                   >
@@ -630,13 +619,7 @@
                 </t-dropdown-item>
                 <t-dropdown-item :value="4">
                   <a
-                    :href="
-                      isDownload
-                        ? '/v/data.xlsx'
-                        : cdn
-                        ? cdn + '/v/data.xlsx?r=' + Math.random()
-                        : '/data.xlsx'
-                    "
+                    :href="'/data.xlsx'"
                     style="color: var(--td-text-color-primary)"
                     @click.stop
                   >
@@ -767,13 +750,7 @@
                 </t-dropdown-item>
                 <t-dropdown-item :value="4">
                   <a
-                    :href="
-                      isDownload
-                        ? '/v/data.xlsx'
-                        : cdn
-                        ? cdn + '/v/data.xlsx?r=' + Math.random()
-                        : '/data.xlsx'
-                    "
+                    :href="'/data.xlsx'"
                     style="color: var(--td-text-color-primary)"
                     @click.stop
                   >
@@ -1118,7 +1095,6 @@ import { typeOptions } from '@/services/common';
 import { MessagePlugin } from 'tdesign-vue-next';
 import { Pen, deepClone } from '@meta2d/core';
 import { useDot } from '@/services/common';
-import { isDownload } from '@/services/defaults';
 import { cdn } from '@/services/api';
 import { importExcel, saveAsExcel } from '@/services/excel';
 import axios from 'axios';

+ 5 - 17
src/views/components/PenDatas.vue

@@ -200,19 +200,7 @@
           </t-select>
         </div>
         <div class="t-space-item" v-if="props.pen.name==='tablePlus'">
-          <div v-if="cell.row!==undefined" class="flex between form-item  py-12">
-              <div  v-if="cell.col!==undefined"  style="line-height: 30px">
-                {{$t( '当前选中单元格' )}}  ({{$t( '第' )}}{{ props.pen.colHeaders? cell.row:cell.row+1 }}{{$t( '行' )}},{{$t( '第' )}}{{ cell.col}}{{$t( '列' )}})
-              </div>
-              <div v-else style="line-height: 30px">
-                {{$t( '当前选中行' )}}  ({{$t( '第' )}}{{ props.pen.colHeaders? cell.row:cell.row+1 }}{{$t( '行' )}})
-              </div>
-              <div>
-                <t-tooltip placement="top" :content="$t('快捷绑定')">
-                 <link-icon style="width: 13px;margin-right: 26px" class="hover ml-4" @click="onQuickBind()"></link-icon>
-                </t-tooltip>
-              </div>
-          </div>
+        
         <div class="form-item py-8" v-if="props.pen.dbid">
           <label>自动保存 
             <t-tooltip content="编辑表格后会自动保存到sql数据库" placement="top">
@@ -251,14 +239,14 @@
         <div class="t-space-item">
           <div v-if="cell.row!==undefined" class="flex between form-item  py-12">
               <div  v-if="cell.col!==undefined"  style="line-height: 30px">
-                选中单元格  (第{{ cell.row }}行,第{{ cell.col}}列)
+                {{$t( '当前选中单元格' )}}  ({{$t( '' )}}{{ props.pen.colHeaders? cell.row:cell.row+1 }}{{$t( '' )}}{{$t( '' )}}{{ cell.col}}{{$t( '' )}})
               </div>
               <div v-else style="line-height: 30px">
-                选中行  (第{{ cell.row }}行)
+                {{$t( '当前选中行' )}}  ({{$t( '' )}}{{ props.pen.colHeaders? cell.row:cell.row+1 }}{{$t( '' )}})
               </div>
               <div>
-                <t-tooltip content="快捷绑定" placement="top">
-                 <link-icon style="width: 13px;margin-right: 26px"class="hover ml-4" @click="onQuickBind()"/>
+                <t-tooltip placement="top" :content="$t('快捷绑定')">
+                 <link-icon style="width: 13px;margin-right: 26px" class="hover ml-4" @click="onQuickBind()"></link-icon>
                 </t-tooltip>
               </div>
           </div>

+ 1 - 1
tsconfig.json

@@ -14,7 +14,7 @@
     "paths": {
       "@/*": ["src/*"],
       // "@meta2d/*": ["../meta2d.js/packages/*"],
-      // "@2d-components/*": ["../2d-components/packages/*"],
+      "@2d-components/*": ["../2d-components/packages/*"],
       // "visio2meta2d": ["../visio2meta2d"],
       // "dxf": ["../dxf"],
       // "@meta3d/*": ["../meta3d.js/*"],

+ 1 - 1
vite.config.ts

@@ -29,7 +29,7 @@ export default defineConfig({
       '@': path.resolve(__dirname, './src/'),
       // '@meta2d/core':path.resolve(__dirname ,'node_modules/@meta2d/core'),
       // '@meta2d': path.resolve(__dirname, '../meta2d.js/packages'),
-      // '@2d-components': path.resolve(__dirname, '../2d-components/packages'),
+      '@2d-components': path.resolve(__dirname, '../2d-components/packages'),
       // "visio2meta2d": path.resolve(__dirname, '../visio2meta2d'),
       // 'dxf': path.resolve(__dirname, '../dxf'),
       // '@meta3d': path.resolve(__dirname, '../meta3d.js'),