bill 8 月之前
父節點
當前提交
a48e5d84a1

+ 3 - 0
src/assets/style/global.css

@@ -33,3 +33,6 @@ textarea {
 .ant-input-number {
   background: var(--colors-normal-back) !important;
 }
+.cesium-widget-credits {
+  display: none !important;
+}

+ 4 - 0
src/assets/style/global.less

@@ -43,4 +43,8 @@ button, input, select, textarea {
 }
 .ant-input-number {
   background: var(--colors-normal-back) !important;
+}
+
+.cesium-widget-credits {
+  display: none !important;
 }

+ 9 - 1
src/components/materials/index.vue

@@ -136,7 +136,7 @@ const rowSelection: any = ref({
       (key) => !origin.value.list.some((item) => key === item.id)
     );
     const newKeys = Array.from(new Set([...otherPageKeys, ...ids]));
-    if (typeof props.count === "number" && props.count >= newKeys.length) {
+    if (typeof props.count !== "number" || props.count >= newKeys.length) {
       selectKeys.value = newKeys;
     } else {
       Message.error(`最多选择${props.count}项`);
@@ -193,6 +193,10 @@ const refresh = debounceStack(
     groups.value = group;
     origin.value = pag;
     pag.list.forEach((item) => (allData[item.id] = item));
+    if (pag.pageNum > 1 && pag.pageNum > Math.ceil(pag.total / pag.pageSize)) {
+      params.pageNum = Math.ceil(pag.total / pag.pageSize);
+      refresh();
+    }
   },
   160
 );
@@ -261,4 +265,8 @@ const handleTableChange: TableProps["onChange"] = (pag, filters) => {
 .ant-modal-root .ant-table-tbody > tr > td {
   word-break: break-all;
 }
+
+.content-header-search {
+  flex: 1;
+}
 </style>

+ 1 - 1
src/layout/show/index.vue

@@ -64,8 +64,8 @@ const initialSys = async () => {
     initialTaggingStyles(),
     initialTaggings(),
     initialGuides(),
-    initialPaths(),
   ]);
+  await initialPaths();
   await initialMeasures();
   await loadModel(fuseModel);
   await asyncTimeout(1000);

+ 1 - 1
src/views/guide/path/edit-path.vue

@@ -101,7 +101,7 @@
               <template v-slot:label>
                 <ui-input
                   type="checkbox"
-                  label="全部范围可"
+                  label="全部范围可"
                   :modelValue="!!data.globalVisibility"
                   @update:modelValue="(v: boolean) => data.globalVisibility = v"
                 />

+ 1 - 1
src/views/guide/show.vue

@@ -33,7 +33,7 @@ import { guides, paths } from "@/store";
 import { Menu, Dropdown } from "ant-design-vue";
 import { DownOutlined } from "@ant-design/icons-vue";
 
-const currentKey = ref("path");
+const currentKey = ref("guide");
 const tabs = computed(() => [
   { key: "guide", text: "导览", count: guides.value.length },
   { key: "path", text: "路线", count: paths.value.length },

+ 2 - 2
src/views/tagging-position/sign.vue

@@ -35,7 +35,7 @@
         <Slider v-model:value="position.mat.scale" :min="0.5" :max="5" :step="0.1" />
       </SignItem>
       <SignItem
-        label="图标角度"
+        label="旋转图标"
         class="item"
         v-if="TaggingPositionType['2d'] !== position.type"
         @apply-global="$emit('applyGlobal', ['mat', 'rotation'])"
@@ -73,7 +73,7 @@
         <template v-slot:label>
           <ui-input
             type="checkbox"
-            label="全部范围可"
+            label="全部范围可"
             :modelValue="!!position.globalVisibility"
             @update:modelValue="(v: boolean) => position.globalVisibility = v"
           />