解决界面查询框可拖动时无法操作控件的问题

pattazl · Feb 16, 2024 · fb14cb9 · fb14cb9
1 parent f8b5936
commit fb14cb9
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 16 deletions.
diff --git a/ui-helper/src/common.ts b/ui-helper/src/common.ts
@@ -311,12 +311,13 @@ function winResize(chartArr) {
 var isDragging = false;
 var offset = { x: 0, y: 0 };
 function addDragFixedSelect() {
-  var myDiv = document.querySelector('#fixedDiv') as HTMLElement;
-  if (myDiv == null) {
+  var mySpan = document.querySelector('#fixedSpan') as HTMLElement;
+  var myDiv = document.querySelector('.fixedSelect>div:first-child>div:first-child') as HTMLElement;
+  if (mySpan == null || myDiv == null) {
     setTimeout(addExtListener, 1000)
     return;
   }
-  myDiv.addEventListener('mousedown', function (event: any) {
+  mySpan.addEventListener('mousedown', function (event: any) {
     isDragging = true;
     offset.x = event.offsetX;
     offset.y = event.offsetY;

diff --git a/ui-helper/src/components/dataui/History.vue b/ui-helper/src/components/dataui/History.vue
@@ -16,8 +16,8 @@
       </n-anchor>
     </div>
     <n-space vertical class="fixedSelect">
-      <n-space style="font-size:16px" id="fixedDiv" :class="store.myTheme == 'dark' ? 'mydark' : 'mylight'">
-        {{ contentText.intro112 }}
+      <n-space style="font-size:16px" :class="store.myTheme == 'dark' ? 'mydark' : 'mylight'">
+        <span id="fixedSpan">{{ contentText.intro112 }}</span>
         <n-date-picker type="date" v-model:value="beginDate" :is-date-disabled="dateDisabled"
           @update:value="handleUpdateValue" />
         <n-switch :round="false" :rail-style="railStyle" v-model:value="showEndDate" @update:value="endDate = beginDate">

diff --git a/ui-helper/src/components/dataui/Statistics.vue b/ui-helper/src/components/dataui/Statistics.vue
@@ -12,8 +12,8 @@
 			</n-anchor>
 		</div>
 		<n-space vertical class="fixedSelect">
-			<n-space style="font-size:16px" id="fixedDiv" :class="store.myTheme == 'dark' ? 'mydark' : 'mylight'">
-				{{ contentText.intro112 }}
+			<n-space style="font-size:16px" :class="store.myTheme == 'dark' ? 'mydark' : 'mylight'">
+				<span id="fixedSpan">{{ contentText.intro112 }}</span>
 				<n-date-picker type="date" v-model:value="beginDate" :is-date-disabled="dateDisabled" />
 				{{ contentText.intro93 }}
 				<n-date-picker type="date" v-model:value="endDate" :is-date-disabled="dateDisabled" />

diff --git a/ui-helper/src/components/dataui/Today.vue b/ui-helper/src/components/dataui/Today.vue
@@ -14,8 +14,8 @@
       </n-anchor>
     </div>
     <n-space vertical class="fixedSelect">
-      <n-space style="font-size:16px" id="fixedDiv" :class="store.myTheme == 'dark' ? 'mydark' : 'mylight'" v-if="beginDate != 0">
-        {{ contentText.intro92 }}
+      <n-space style="font-size:16px" :class="store.myTheme == 'dark' ? 'mydark' : 'mylight'" v-if="beginDate != 0">
+        <span id="fixedSpan">{{ contentText.intro92 }}</span>
         <n-select v-model:value="beginDate" :options="historyDate" @update:value="handleUpdateValue" /> {{
           contentText.intro93 }}
         <n-select v-model:value="endDate" :options="historyDate" @update:value="handleUpdateValue" />

diff --git a/ui-helper/src/res/common.css b/ui-helper/src/res/common.css
@@ -7,12 +7,15 @@
 }
 
 .fixedSelect>div:first-child>div:first-child {
-    cursor:move;
     position: fixed;
     margin-left: 0px;
     padding: 5px;
     z-index: 1000;
-        /* background-color: aliceblue; */
+    /* background-color: aliceblue; */
+}
+
+#fixedSpan {
+    cursor: move;
 }
 
 .fixedSelect>div:nth-child(2)>div:first-child {
@@ -25,6 +28,6 @@
 }
 
 .mydark {
-    background-color:  #333
-    /* dark 主题的背景色 #333;*/
+    background-color: #333
+        /* dark 主题的背景色 #333;*/
 }
diff --git a/ui-helper/src/version.ts b/ui-helper/src/version.ts
@@ -2,9 +2,9 @@
 * @version 配置显示在登录页面的前端版本，格式为 v.主版本号.次版本号.日期.小版本序号 v1.0.190827.1
 */
 // 对于发布版 YYMMDD 和 verNo 会在Webpack中自动替换为真实的日期和版本序号,如下格式不能随便改，参考vue.config.js的代码
-const replaceYYMMDD = '240215';
-const replaceVerNo = '1';
-const mainVersion = ' v1.30';
+const replaceYYMMDD = '240216';
+const replaceVerNo = '0';
+const mainVersion = ' v1.31';
 const strVersion = mainVersion+'.'+replaceYYMMDD+'.'+replaceVerNo;   // 可以支持旧版浏览器
 //export default strVersion
 export {strVersion};