ym-giswidget-2d 1.0.5 → 1.0.8

package/components/select/index.js

@@ -0,0 +1,8 @@
+import "./index.css";
+import { withInstall } from "../../utils/wthInstall.js";
+import _sfc_main from "./Select.vue.js";
+const Select = withInstall(_sfc_main);
+export {
+  Select,
+  Select as default
+};

package/components/swipe-layer/SwipeLayer.vue.d.ts

@@ -0,0 +1,6 @@
+import { default as OLMap } from 'ym-giscomm-2d/mapView/Map';
+type __VLS_Props = {
+    map: OLMap;
+};
+declare const _default: import('vue').DefineComponent<__VLS_Props, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<__VLS_Props> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
+export default _default;

package/components/swipe-layer/SwipeLayer.vue.js

@@ -0,0 +1,24 @@
+import { defineComponent, onMounted, onUnmounted } from "vue";
+import SwipeLayerControl from "ym-giscomm-2d/controls/SwipeLayerControl";
+const _sfc_main = /* @__PURE__ */ defineComponent({
+  __name: "SwipeLayer",
+  props: {
+    map: {}
+  },
+  setup(__props) {
+    const props = __props;
+    onMounted(() => {
+      const control = new SwipeLayerControl({ swipeLayer: props.map.getAllLayers()[0], dockedVisible: "Right", target: props.map.getTarget() });
+      props.map.controlManager.addControl("swipe", control);
+    });
+    onUnmounted(() => {
+      props.map.controlManager.removeControl("swipe");
+    });
+    return (_ctx, _cache) => {
+      return null;
+    };
+  }
+});
+export {
+  _sfc_main as default
+};

package/components/swipe-layer/SwipeLayer.vue2.js

@@ -0,0 +1,4 @@
+import _sfc_main from "./SwipeLayer.vue.js";
+export {
+  _sfc_main as default
+};

package/components/swipe-layer/index.d.ts

@@ -0,0 +1,6 @@
+export declare const SwipeLayer: import('../../utils').WithInstall<import('vue').DefineComponent<{
+    map: import('ym-giscomm-2d/mapView/Map').default;
+}, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<{
+    map: import('ym-giscomm-2d/mapView/Map').default;
+}> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>>;
+export default SwipeLayer;

package/components/swipe-layer/index.js

@@ -0,0 +1,8 @@
+import "./index.css";
+import { withInstall } from "../../utils/wthInstall.js";
+import _sfc_main from "./SwipeLayer.vue.js";
+const SwipeLayer = withInstall(_sfc_main);
+export {
+  SwipeLayer,
+  SwipeLayer as default
+};

package/components/toc-card/{tocCard.vue.js → TocCard.vue.js}

@@ -1,7 +1,7 @@
-import _sfc_main from "./tocCard.vue2.js";
+import _sfc_main from "./TocCard.vue2.js";
 /* empty css             */
 import _export_sfc from "../../_virtual/_plugin-vue_export-helper.js";
-const _TocCard = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-92118f87"]]);
+const _TocCard = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-cdfeea6d"]]);
 export {
   _TocCard as default
 };

package/components/toc-card/{tocCard.vue2.js → TocCard.vue2.js}

@@ -1,10 +1,10 @@
 import { ElCard } from "element-plus/es";
 import "element-plus/es/components/base/style/css";
 import "element-plus/es/components/card/style/css";
-import { defineComponent, openBlock, createBlock, withCtx, createVNode, unref } from "vue";
+import { defineComponent, createBlock, openBlock, withCtx, createVNode, unref } from "vue";
 import { LayerTree } from "../layer-tree/index.js";
 const _sfc_main = /* @__PURE__ */ defineComponent({
-  __name: "tocCard",
+  __name: "TocCard",
   props: {
     data: {},
     map: {},

package/components/toc-card/index.css

@@ -1,4 +1,4 @@
-.toc-card[data-v-92118f87] {
+.toc-card[data-v-cdfeea6d] {
   background-color: var(--system-primary-color);
   position: absolute;
   width: 245px;

package/components/toc-card/index.js

@@ -1,6 +1,6 @@
 import "./index.css";
 import { withInstall } from "../../utils/wthInstall.js";
-import _TocCard from "./tocCard.vue.js";
+import _TocCard from "./TocCard.vue.js";
 const TocCard = withInstall(_TocCard);
 export {
   TocCard,

package/config/Config.d.ts

@@ -0,0 +1,13 @@
+/**
+ * 配置
+ */
+export default class Config {
+    /**
+     * 后端服务地址
+     */
+    static ServiceUrl: string;
+    /**
+     * gis数据分析处理服务地址
+     */
+    static GisServiceUrl: string;
+}

package/config/Config.js

@@ -0,0 +1,8 @@
+const _Config = class _Config {
+};
+_Config.ServiceUrl = "";
+_Config.GisServiceUrl = "";
+let Config = _Config;
+export {
+  Config as default
+};

package/css/index.css

@@ -1847,10 +1847,6 @@
   text-overflow: ellipsis;
 }
 
-.el-cascader .el-input .el-input__suffix-inner .el-icon {
-  height: calc(100% - 2px);
-}
-
 .el-cascader .el-input .el-input__suffix-inner .el-icon svg {
   vertical-align: middle;
 }
@@ -1992,6 +1988,7 @@
 
 .el-cascader__tags .el-tag > span {
   flex: 1;
+  line-height: normal;
   overflow: hidden;
   text-overflow: ellipsis;
 }
@@ -2041,6 +2038,7 @@
 
 .el-cascader__collapse-tags .el-tag > span {
   flex: 1;
+  line-height: normal;
   overflow: hidden;
   text-overflow: ellipsis;
 }
@@ -5918,6 +5916,10 @@
   border-color: var(--el-color-primary);
 }
 
+.el-color-picker.is-disabled {
+  pointer-events: none;
+}
+
 .el-color-picker.is-disabled .el-color-picker__trigger {
   cursor: not-allowed;
 }
@@ -6733,6 +6735,7 @@
   background-color: var(--el-disabled-bg-color);
   color: var(--el-disabled-text-color);
   cursor: not-allowed;
+  pointer-events: none;
 }
 
 .el-range-editor.is-disabled, .el-range-editor.is-disabled:focus, .el-range-editor.is-disabled:hover {
@@ -7437,6 +7440,7 @@
 .el-dialog.is-fullscreen {
   --el-dialog-width:100%;
   --el-dialog-margin-top:0;
+  border-radius: 0;
   height: 100%;
   margin-bottom: 0;
   overflow: auto;
@@ -8246,7 +8250,6 @@
 
 .el-image-viewer__btn .el-icon {
   cursor: pointer;
-  font-size: inherit;
 }
 
 .el-image-viewer__close {
@@ -8278,7 +8281,6 @@
   left: 50%;
   padding: 0 23px;
   transform: translateX(-50%);
-  width: 282px;
 }
 
 .el-image-viewer__actions__inner {
@@ -8287,11 +8289,25 @@
   cursor: default;
   display: flex;
   font-size: 23px;
+  gap: 22px;
   height: 100%;
   justify-content: space-around;
+  padding: 0 6px;
   width: 100%;
 }
 
+.el-image-viewer__actions__divider {
+  margin: 0 -6px;
+}
+
+.el-image-viewer__progress {
+  bottom: 90px;
+  color: #fff;
+  cursor: default;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
 .el-image-viewer__prev {
   left: 40px;
 }
@@ -8591,8 +8607,11 @@
   box-shadow: 0 0 0 1px var(--el-input-focus-border-color) inset;
 }
 
-.el-input__inner {
+.el-input {
   --el-input-inner-height:calc(var(--el-input-height, 32px) - 2px);
+}
+
+.el-input__inner {
   -webkit-appearance: none;
   background: none;
   border: none;
@@ -8633,6 +8652,7 @@
   flex-shrink: 0;
   flex-wrap: nowrap;
   height: 100%;
+  line-height: var(--el-input-inner-height);
   pointer-events: none;
   text-align: center;
   transition: all var(--el-transition-duration);
@@ -8660,6 +8680,7 @@
   flex-shrink: 0;
   flex-wrap: nowrap;
   height: 100%;
+  line-height: var(--el-input-inner-height);
   pointer-events: none;
   text-align: center;
   transition: all var(--el-transition-duration);
@@ -8702,6 +8723,8 @@
 .el-input.is-disabled .el-input__wrapper {
   background-color: var(--el-disabled-bg-color);
   box-shadow: 0 0 0 1px var(--el-disabled-border-color) inset;
+  cursor: not-allowed;
+  pointer-events: none;
 }
 
 .el-input.is-disabled .el-input__inner {
@@ -8739,7 +8762,7 @@
   padding: 1px 15px;
 }
 
-.el-input--large .el-input__inner {
+.el-input--large {
   --el-input-inner-height:calc(var(--el-input-height, 40px) - 2px);
 }
 
@@ -8752,7 +8775,7 @@
   padding: 1px 7px;
 }
 
-.el-input--small .el-input__inner {
+.el-input--small {
   --el-input-inner-height:calc(var(--el-input-height, 24px) - 2px);
 }
 
@@ -8921,6 +8944,10 @@
   width: 40px;
 }
 
+.el-input-number--large.is-controls-right .el-input--large .el-input__wrapper {
+  padding-right: 47px;
+}
+
 .el-input-number--large .el-input--large .el-input__wrapper {
   padding-left: 47px;
   padding-right: 47px;
@@ -8936,6 +8963,10 @@
   width: 24px;
 }
 
+.el-input-number--small.is-controls-right .el-input--small .el-input__wrapper {
+  padding-right: 31px;
+}
+
 .el-input-number--small .el-input--small .el-input__wrapper {
   padding-left: 31px;
   padding-right: 31px;
@@ -8991,6 +9022,7 @@
 
 .el-input-tag {
   --el-input-tag-border-color-hover:var(--el-border-color-hover);
+  --el-input-tag-placeholder-color:var(--el-text-color-placeholder);
   --el-input-tag-disabled-color:var(--el-disabled-text-color);
   --el-input-tag-disabled-border:var(--el-disabled-border-color);
   --el-input-tag-font-size:var(--el-font-size-base);
@@ -9030,6 +9062,7 @@
 .el-input-tag.is-disabled {
   background-color: var(--el-fill-color-light);
   cursor: not-allowed;
+  pointer-events: none;
 }
 
 .el-input-tag.is-disabled, .el-input-tag.is-disabled:hover {
@@ -9127,6 +9160,14 @@
   width: 100%;
 }
 
+.el-input-tag__input::-moz-placeholder {
+  color: var(--el-input-tag-placeholder-color);
+}
+
+.el-input-tag__input::placeholder {
+  color: var(--el-input-tag-placeholder-color);
+}
+
 .el-input-tag__input-calculator {
   left: 0;
   max-width: 100%;
@@ -10080,8 +10121,10 @@
 }
 
 .el-notification__group {
+  flex: 1;
   margin-left: var(--el-notification-group-margin-left);
   margin-right: var(--el-notification-group-margin-right);
+  min-width: 0;
 }
 
 .el-notification__title {
@@ -10104,6 +10147,7 @@
 }
 
 .el-notification .el-notification__icon {
+  flex-shrink: 0;
   font-size: var(--el-notification-icon-size);
   height: var(--el-notification-icon-size);
   width: var(--el-notification-icon-size);
@@ -11513,6 +11557,7 @@
   background-color: var(--el-fill-color-light);
   color: var(--el-text-color-placeholder);
   cursor: not-allowed;
+  pointer-events: none;
 }
 
 .el-select__wrapper.is-disabled, .el-select__wrapper.is-disabled:hover {
@@ -11603,6 +11648,7 @@
   top: 50%;
   transform: translateY(-50%);
   width: 100%;
+  z-index: -1;
 }
 
 .el-select__placeholder.is-transparent {
@@ -11642,12 +11688,13 @@
 }
 
 .el-select__input-wrapper {
-  max-width: 100%;
+  flex: 1;
 }
 
 .el-select__input-wrapper.is-hidden {
   opacity: 0;
   position: absolute;
+  z-index: -1;
 }
 
 .el-select__input {
@@ -11660,9 +11707,9 @@
   font-family: inherit;
   font-size: inherit;
   height: 24px;
-  max-width: 100%;
   outline: none;
   padding: 0;
+  width: 100%;
 }
 
 .el-select__input.is-disabled {
@@ -12147,7 +12194,6 @@
 
 .el-step__icon.is-text {
   border: 2px solid;
-  border-color: inherit;
   border-radius: 50%;
 }
 
@@ -12177,13 +12223,12 @@
 
 .el-step__line {
   background-color: var(--el-text-color-placeholder);
-  border-color: inherit;
+  border-color: currentColor;
   position: absolute;
 }
 
 .el-step__line-inner {
   border: 1px solid;
-  border-color: inherit;
   box-sizing: border-box;
   display: block;
   height: 0;
@@ -13571,6 +13616,7 @@
   color: var(--el-text-color-primary);
   cursor: pointer;
   display: flex;
+  flex-shrink: 0;
   font-size: 12px;
   height: 20px;
   justify-content: center;
@@ -16409,6 +16455,10 @@
   border-top-color: transparent;
 }
 
+.el-mention.is-disabled {
+  pointer-events: none;
+}
+
 .el-mention-dropdown {
   --el-mention-font-size:var(--el-font-size-base);
   --el-mention-bg-color:var(--el-bg-color-overlay);

package/http/Axios.d.ts

@@ -0,0 +1,14 @@
+/**
+ * get方法，对应get请求
+ * @param {String} url [请求的url地址]
+ * @param {Object} params [请求时携带的参数]
+ */
+export declare function get<T>(url: string, params?: any, headers?: any): Promise<T>;
+export declare function del<T>(url: string, params?: any, headers?: any): Promise<T>;
+/**
+ * post方法，对应post请求
+ * @param {String} url [请求的url地址]
+ * @param {Object} params [请求时携带的参数]
+ */
+export declare function post<T>(url: string, params: any, config?: any): Promise<T>;
+export declare function postFormData<T>(url: string, formData: FormData): Promise<T>;

package/http/Axios.js

@@ -0,0 +1,37 @@
+import { ElMessage } from "element-plus";
+import "../node_modules/.pnpm/axios@1.8.3/node_modules/axios/index.js";
+import axios from "../node_modules/.pnpm/axios@1.8.3/node_modules/axios/lib/axios.js";
+let http = axios.create();
+http.interceptors.response.use((res) => {
+  if (res.status !== 200) {
+    ElMessage.error(res.statusText);
+    return Promise.reject(res.statusText);
+  } else if (res.data.success == false) {
+    ElMessage.error(res.data.msg);
+    return Promise.reject(res.data.msg);
+  }
+  return res;
+}, (err) => {
+  if (err.response && err.response.data) {
+    ElMessage.error(err);
+  }
+  return Promise.reject(err);
+});
+http.interceptors.request.use(function(config) {
+  return config;
+}, function(error) {
+  return Promise.reject(error);
+});
+http.defaults.timeout = 6e4;
+async function post(url, params, config) {
+  const res = await http.post(url, params, config);
+  return res.data.data;
+}
+async function postFormData(url, formData) {
+  const res = await http.post(url, formData);
+  return res.data.data;
+}
+export {
+  post,
+  postFormData
+};

package/http/LayerField.js

@@ -0,0 +1,29 @@
+import { post } from "./Axios.js";
+import Config from "../config/Config.js";
+import { getSourceLayerFields } from "ym-giscomm-2d/capabilities";
+async function list(layerId) {
+  if (!Config.ServiceUrl) {
+    return [];
+  }
+  return await post(`${Config.ServiceUrl}/layer-field/list?layerId=${layerId}`, {});
+}
+async function getLayerFields(layerInfo) {
+  if (layerInfo.fields) {
+    return layerInfo.fields;
+  }
+  let fields = await list(layerInfo.id);
+  if (fields && fields.length > 0) {
+    layerInfo.fields = fields;
+    return fields;
+  }
+  if (!layerInfo.url || !layerInfo.selectIndex || !layerInfo.layerType) {
+    return [];
+  }
+  fields = await getSourceLayerFields(layerInfo.url, layerInfo.selectIndex, layerInfo.layerType);
+  layerInfo.fields = fields;
+  return fields;
+}
+export {
+  getLayerFields,
+  list
+};

package/http/SpaceFile.d.ts

@@ -0,0 +1,3 @@
+import { Feature } from 'ol';
+export declare function importFile(file: File, fileWkid?: number, toWkid?: number): Promise<any>;
+export declare function exportFeatures(features: Feature[], wkid: number, fileName: string, extension: "shp", toWkid?: number): Promise<any>;

package/http/SpaceFile.js

@@ -0,0 +1,38 @@
+import { postFormData } from "./Axios.js";
+import Config from "../config/Config.js";
+import WKT from "../node_modules/.pnpm/ol@9.2.4/node_modules/ol/format/WKT.js";
+async function importFile(file, fileWkid, toWkid) {
+  if (!Config.GisServiceUrl) {
+    return [];
+  }
+  const formData = new FormData();
+  formData.append("file", file);
+  if (toWkid) {
+    formData.append("toWkid", toWkid.toString());
+  }
+  return await postFormData(`${Config.GisServiceUrl}/space/import`, formData);
+}
+async function exportFeatures(features, wkid, fileName, extension, toWkid) {
+  if (!Config.GisServiceUrl) {
+    return [];
+  }
+  const wkt = new WKT();
+  const featureCollection = features.map((feature) => {
+    const properties = { ...feature.getProperties() };
+    delete properties.geometry;
+    return {
+      geometry: wkt.writeGeometry(feature.getGeometry()),
+      properties
+    };
+  });
+  const formData = new FormData();
+  formData.append("features", JSON.stringify(featureCollection));
+  formData.append("wkid", wkid.toString());
+  formData.append("fileName", fileName);
+  formData.append("extension", extension);
+  return await postFormData(`${Config.GisServiceUrl}/space/exportFeatures`, formData);
+}
+export {
+  exportFeatures,
+  importFile
+};

package/http/layerField.d.ts

@@ -0,0 +1,19 @@
+import { IMapService, ILayerField } from 'ym-giscomm-2d/entity';
+/**
+ * 根据地图服务id获取字段列表
+ * @param query
+ * @returns
+ */
+export declare function list(layerId: string): Promise<ILayerField[]>;
+/**
+ * 添加或更新地图服务字段
+ * @param mapService
+ * @returns
+ */
+export declare function addOrUpdateFields(layerFields: ILayerField[], layerId: string): Promise<ILayerField[]>;
+/**
+ * 获取图层字段信息
+ * @param layerInfo
+ * @returns
+ */
+export declare function getLayerFields(layerInfo: IMapService): Promise<ILayerField[]>;

package/index.d.ts

@@ -1,3 +1,10 @@
 export * from './components/multi-screen';
 export * from './components/horizontally-top-toolbar';
 export * from './components/toc-card';
+export * from './components/clear';
+export * from './components/select';
+export * from './components/swipe-layer';
+export * from './components/draw';
+export * from './components/export';
+export * from './components/import';
+export * from './components/identify';

package/index.js

@@ -2,8 +2,22 @@
 import { MultiScreen } from "./components/multi-screen/index.js";
 import { HorizontallyTopToolbar } from "./components/horizontally-top-toolbar/index.js";
 import { TocCard } from "./components/toc-card/index.js";
+import { Clear } from "./components/clear/index.js";
+import { Select } from "./components/select/index.js";
+import { SwipeLayer } from "./components/swipe-layer/index.js";
+import { Draw } from "./components/draw/index.js";
+import { Export } from "./components/export/index.js";
+import { Import } from "./components/import/index.js";
+import { Identify } from "./components/identify/index.js";
 export {
+  Clear,
+  Draw,
+  Export,
   HorizontallyTopToolbar,
+  Identify,
+  Import,
   MultiScreen,
+  Select,
+  SwipeLayer,
   TocCard
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ym-giswidget-2d",
-  "version": "1.0.5",
+  "version": "1.0.8",
   "type": "module",
   "main": "index.js",
   "module": "index.js",
@@ -10,6 +10,6 @@
     "ol": "^9.2.4",
     "@element-plus/icons-vue": "^2.3.1",
     "element-plus": "^2.9.0",
-    "ym-giscomm-2d": "1.0.3"
+    "ym-giscomm-2d": "1.0.9"
   }
 }