@jetlinks-web/components 1.0.1 → 1.0.2

package/package.json

@@ -1,12 +1,9 @@
 {
   "name": "@jetlinks-web/components",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "",
   "main": "index.ts",
   "module": "index.ts",
-  "scripts": {
-    "clean": "pnpm rimraf node_modules && pnpm rimraf .turbo"
-  },
   "keywords": [],
   "files": [
     "src",
@@ -16,9 +13,6 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@jetlinks-web/hooks": "workspace:^",
-    "@jetlinks-web/stores": "workspace:^",
-    "@jetlinks-web/utils": "workspace:^",
     "@vuemap/vue-amap": "^2.0.17",
     "@vueuse/core": "^10.2.1",
     "ant-design-vue": "^3.2.20",
@@ -26,10 +20,16 @@
     "lodash-es": "^4.17.21",
     "pinia": "^2.1.6",
     "vue": "^3.3.4",
-    "vue-router": "^4.2.4"
+    "vue-router": "^4.2.4",
+    "@jetlinks-web/hooks": "^1.0.3",
+    "@jetlinks-web/utils": "^1.0.2",
+    "@jetlinks-web/stores": "^1.0.1"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
+  },
+  "scripts": {
+    "clean": "pnpm rimraf node_modules && pnpm rimraf .turbo"
   }
-}
+}

package/src/AMap/Map.vue

@@ -33,8 +33,8 @@ import type { CSSProperties, PropType } from 'vue';
 import { ref, computed } from 'vue'
 import { initAMapApiLoader, ElAmap } from '@vuemap/vue-amap';
 import '@vuemap/vue-amap/dist/style.css';
-import { store } from '@jetlinks/stores'
-import { getAMapUiPromise } from '@jetlinks/utils'
+import { store } from '@jetlinks-web/stores'
+import { getAMapUiPromise } from '@jetlinks-web/utils'
 import { MapProps } from './util'
 interface AMapProps {
   style?: CSSProperties;

package/src/Echarts/Echarts.vue

@@ -1,43 +1,43 @@
-<template>
-  <div ref="echartsDom" class="echarts-warp" :style="style"></div>
-</template>
-  
-  <script lang="ts" name="Echarts" setup>
-import { CSSProperties, nextTick, ref, watch, Ref } from 'vue'
-import { useECharts } from '@jetlinks/hooks'
-
-interface Props {
-  style?: CSSProperties
-}
-
-const props = defineProps({
-  options: {
-    type: Object,
-    default: undefined,
-  },
-  style: Object as PropType<Props['style']>,
-})
-
-const echartsDom = ref<Ref<HTMLDivElement> | HTMLDivElement>()
-
-const { setOptions } = useECharts(echartsDom.value)
-
-watch(
-  () => props.options,
-  () => {
-    if (props.options) {
-      nextTick(() => {
-        setOptions(props.options)
-      })
-    }
-  },
-  { immediate: true, deep: true },
-)
-</script>
-  
-<style scoped>
-.echarts-warp {
-  width: 100%;
-  height: 100%;
-}
-</style>
+<template>
+  <div ref="echartsDom" class="echarts-warp" :style="style"></div>
+</template>
+
+  <script lang="ts" name="Echarts" setup>
+import { CSSProperties, nextTick, ref, watch, Ref } from 'vue'
+import { useECharts } from '@jetlinks-web/hooks'
+
+interface Props {
+  style?: CSSProperties
+}
+
+const props = defineProps({
+  options: {
+    type: Object,
+    default: undefined,
+  },
+  style: Object as PropType<Props['style']>,
+})
+
+const echartsDom = ref<Ref<HTMLDivElement> | HTMLDivElement>()
+
+const { setOptions } = useECharts(echartsDom.value)
+
+watch(
+  () => props.options,
+  () => {
+    if (props.options) {
+      nextTick(() => {
+        setOptions(props.options)
+      })
+    }
+  },
+  { immediate: true, deep: true },
+)
+</script>
+
+<style scoped>
+.echarts-warp {
+  width: 100%;
+  height: 100%;
+}
+</style>

package/src/GeoComponent/GeoComponent.vue

@@ -1,139 +1,139 @@
-<!-- 坐标点拾取组件 -->
-<template>
-  <div class="page-container">
-    <j-input allowClear v-bind="props" v-model:value="inputPoint">
-      <template #addonAfter>
-        <AIcon type="EnvironmentOutlined" @click="modalVisible = true" />
-      </template>
-    </j-input>
-    <j-modal
-      title="地理位置"
-      ok-text="确认"
-      cancel-text="取消"
-      v-model:visible="modalVisible"
-      width="700px"
-      @cancel="modalVisible = false"
-      @ok="handleModalSubmit"
-      destroyOnClose
-    >
-      <div style="width: 100%; height: 400px">
-        <div style="margin-bottom: 10px;">地理位置：{{ mapPoint }}</div>
-        <el-amap
-          :center="_center"
-          :zoom="_zoom"
-          @init="initMap"
-          @click="clickMap"
-        >
-          <el-amap-search-box visible @select="selectPosition" />
-          <el-amap-marker :position="position" />
-        </el-amap>
-      </div>
-    </j-modal>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { store } from '@jetlinks/stores'
-import { initAMapApiLoader } from '@vuemap/vue-amap'
-import '@vuemap/vue-amap/dist/style.css'
-import { computed, CSSProperties, PropType, ref } from 'vue'
-
-interface AMapProps {
-  style?: CSSProperties
-  class?: string
-  AMapUI?: string | boolean
-  plugins?: string[]
-}
-
-const systemStore = store.SystemStore
-
-const amapKey = systemStore.systemInfo.apiKey
-
-interface EmitProps {
-  (e: 'update:point', data: string): void
-  (e: 'change', data: string): void
-}
-const props = defineProps({
-  style: Object as PropType<AMapProps['style']>,
-  class: String as PropType<AMapProps['class']>,
-  AMapUI: [String, Boolean],
-  center: Array as PropType<number[]>,
-  plugin: Array,
-  zoom: {
-    type: Number,
-    default: 12,
-  },
-  securityJsCode: String,
-  point: { type: [Number, String], default: '' },
-})
-const emit = defineEmits<EmitProps>()
-
-
-initAMapApiLoader({
-  key: amapKey,
-  securityJsCode: props.securityJsCode
-})
-
-// 手动输入的坐标点(经纬度字符串)
-const inputPoint = computed({
-  get: () => {
-    return props.point
-  },
-  set: (val: any) => {
-    mapPoint.value = val
-    emit('update:point', val)
-    emit('change', val)
-  },
-})
-
-// 地图弹窗
-const modalVisible = ref<boolean>(false)
-
-const handleModalSubmit = () => {
-  inputPoint.value = mapPoint.value
-  modalVisible.value = false
-}
-
-// 地图拾取的坐标点(经纬度字符串)
-const mapPoint = ref('')
-
-const _zoom = ref<number>(props.zoom)
-const _center = ref<number[]>(props?.center || [])
-let map: any = null
-
-// 地图经纬度
-const position = ref<number[] | string[]>([])
-
-/**
- * 地图初始化
- * @param e
- */
-const initMap = (e: any) => {
-  map = e
-
-  const pointStr = mapPoint.value as string
-  position.value = pointStr ? pointStr.split(',') : _center.value
-}
-
-/**
- * 地图点击
- * @param e
- */
-const clickMap = (e: any) => {
-  mapPoint.value = `${e.lnglat.lng},${e.lnglat.lat}`
-  position.value = [e.lnglat.lng, e.lnglat.lat]
-}
-
-/**
- * 选择搜索结果
- * @param e
- */
-const selectPosition = (e: any) => {
-  const selectPoint = [e.poi.location.lng, e.poi.location.lat]
-  map.setCenter(selectPoint)
-  mapPoint.value = selectPoint.join(',')
-  position.value = selectPoint
-}
-</script>
-
-<style lang="less" scoped></style>
+<!-- 坐标点拾取组件 -->
+<template>
+  <div class="page-container">
+    <j-input allowClear v-bind="props" v-model:value="inputPoint">
+      <template #addonAfter>
+        <AIcon type="EnvironmentOutlined" @click="modalVisible = true" />
+      </template>
+    </j-input>
+    <j-modal
+      title="地理位置"
+      ok-text="确认"
+      cancel-text="取消"
+      v-model:visible="modalVisible"
+      width="700px"
+      @cancel="modalVisible = false"
+      @ok="handleModalSubmit"
+      destroyOnClose
+    >
+      <div style="width: 100%; height: 400px">
+        <div style="margin-bottom: 10px;">地理位置：{{ mapPoint }}</div>
+        <el-amap
+          :center="_center"
+          :zoom="_zoom"
+          @init="initMap"
+          @click="clickMap"
+        >
+          <el-amap-search-box visible @select="selectPosition" />
+          <el-amap-marker :position="position" />
+        </el-amap>
+      </div>
+    </j-modal>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { store } from '@jetlinks-web/stores'
+import { initAMapApiLoader } from '@vuemap/vue-amap'
+import '@vuemap/vue-amap/dist/style.css'
+import { computed, CSSProperties, PropType, ref } from 'vue'
+
+interface AMapProps {
+  style?: CSSProperties
+  class?: string
+  AMapUI?: string | boolean
+  plugins?: string[]
+}
+
+const systemStore = store.SystemStore
+
+const amapKey = systemStore.systemInfo.apiKey
+
+interface EmitProps {
+  (e: 'update:point', data: string): void
+  (e: 'change', data: string): void
+}
+const props = defineProps({
+  style: Object as PropType<AMapProps['style']>,
+  class: String as PropType<AMapProps['class']>,
+  AMapUI: [String, Boolean],
+  center: Array as PropType<number[]>,
+  plugin: Array,
+  zoom: {
+    type: Number,
+    default: 12,
+  },
+  securityJsCode: String,
+  point: { type: [Number, String], default: '' },
+})
+const emit = defineEmits<EmitProps>()
+
+
+initAMapApiLoader({
+  key: amapKey,
+  securityJsCode: props.securityJsCode
+})
+
+// 手动输入的坐标点(经纬度字符串)
+const inputPoint = computed({
+  get: () => {
+    return props.point
+  },
+  set: (val: any) => {
+    mapPoint.value = val
+    emit('update:point', val)
+    emit('change', val)
+  },
+})
+
+// 地图弹窗
+const modalVisible = ref<boolean>(false)
+
+const handleModalSubmit = () => {
+  inputPoint.value = mapPoint.value
+  modalVisible.value = false
+}
+
+// 地图拾取的坐标点(经纬度字符串)
+const mapPoint = ref('')
+
+const _zoom = ref<number>(props.zoom)
+const _center = ref<number[]>(props?.center || [])
+let map: any = null
+
+// 地图经纬度
+const position = ref<number[] | string[]>([])
+
+/**
+ * 地图初始化
+ * @param e
+ */
+const initMap = (e: any) => {
+  map = e
+
+  const pointStr = mapPoint.value as string
+  position.value = pointStr ? pointStr.split(',') : _center.value
+}
+
+/**
+ * 地图点击
+ * @param e
+ */
+const clickMap = (e: any) => {
+  mapPoint.value = `${e.lnglat.lng},${e.lnglat.lat}`
+  position.value = [e.lnglat.lng, e.lnglat.lat]
+}
+
+/**
+ * 选择搜索结果
+ * @param e
+ */
+const selectPosition = (e: any) => {
+  const selectPoint = [e.poi.location.lng, e.poi.location.lat]
+  map.setCenter(selectPoint)
+  mapPoint.value = selectPoint.join(',')
+  position.value = selectPoint
+}
+</script>
+
+<style lang="less" scoped></style>

package/src/PermissionButton/hooks.ts

@@ -1,6 +1,6 @@
 import {watch, ref} from 'vue'
 import type { Ref } from 'vue'
-import { store } from '@jetlinks/stores'
+import { store } from '@jetlinks-web/stores'
 import {isBoolean} from "lodash-es";
 
 export const usePermission = (code?: string | string[] | boolean): {