fix: 修复社区版bug

2023-04-17 19:01:13 +08:00 · 2023-04-17 19:01:13 +08:00 · 126c33ad82
parent 159a2f8ca7
commit 126c33ad82
22 changed files with 195 additions and 130 deletions
--- a/package.json
+++ b/package.json
@ -25,7 +25,7 @@
    "event-source-polyfill": "^1.0.31",
    "global": "^4.4.0",
    "jetlinks-store": "^0.0.3",
-    "jetlinks-ui-components": "^1.0.5",
+    "jetlinks-ui-components": "1.0.5",
    "js-cookie": "^3.0.1",
    "less": "^4.1.3",
    "less-loader": "^11.1.0",
--- a/src/components/Form/rules.ts
+++ b/src/components/Form/rules.ts
@ -0,0 +1,27 @@
+
+const MaxLengthStringFn = (len: number = 64) => ({
+  max: len,
+  message: `最多输入${64}个字符`,
+})
+
+export const Max_Length_64 = [MaxLengthStringFn()]
+export const Max_Length_200 = [MaxLengthStringFn(200)]
+
+export const RequiredStringFn = (name: string, type: string = 'input') => {
+  let typeName = '输入'
+  if (['select', 'date'].includes(type)) {
+    typeName = '选择'
+  }
+  return {
+    required: true,
+    message: `请${typeName}${name}`,
+  }
+}
+
+export const ID_Rule = [
+  {
+    pattern: /^[a-zA-Z0-9_\-]+$/,
+    message: '请输入英文或者数字或者-或者_',
+  },
+  Max_Length_64[0]
+]
--- a/src/utils/setting.ts
+++ b/src/utils/setting.ts
@ -3,13 +3,5 @@ import { isNoCommunity } from '@/utils/utils';
 // 过滤网关类型
 export const accessConfigTypeFilter = (data: any[], filterKey: string = 'id'): any[] => {
  if (!data) return []
-  const filterKeys = !isNoCommunity ?
-    [
-      'mqtt-server-gateway',
-      'http-server-gateway',
-      'mqtt-client-gateway',
-      'tcp-server-gateway',
-      'plugin_gateway'
-    ] : ['plugin_gateway']
-  return data.filter(item => !filterKeys.includes(item[filterKey])).map( item => ({ ...item, label: item.name, value: item.id}))
+  return data.map( item => ({ ...item, label: item.name, value: item.id}))
 }
--- a/src/views/device/DashBoard/index.vue
+++ b/src/views/device/DashBoard/index.vue
@ -53,7 +53,7 @@
                    </div>
                </j-col>
            </j-row>
-            <j-row :span="24" v-if="AmapKey">
+            <j-row :span="24" v-if="AmapKey && isNoCommunity">
                <j-col :span="24">
                    <div class="device-position">
                        <Guide title="设备分布"></Guide>
@ -84,6 +84,8 @@ import { useMenuStore } from '@/store/menu';
 import Amap from './components/Amap.vue';
 import { useSystem } from '@/store/system';
 import dayjs from 'dayjs'
+import { isNoCommunity } from '@/utils/utils'
+
 const system = useSystem();
 const AmapKey = system.$state.configInfo.amap?.apiKey;
 let productTotal = ref(0);
--- a/src/views/home/components/Pie.vue
+++ b/src/views/home/components/Pie.vue
@ -4,7 +4,7 @@

 <script setup lang="ts">
 import * as echarts from 'echarts';
-import { ComponentInternalInstance } from 'vue';
+import { ComponentInternalInstance, onBeforeUnmount } from 'vue';

 const { proxy } = getCurrentInstance() as ComponentInternalInstance;

@ -46,20 +46,35 @@ const options = computed(() => ({
    ],
 }));

+const myChart = ref()
+
 watch(options, () => {
-    initChart();
+    if (myChart.value) {
+      myChart.value.setOption(options.value)
+    } else {
+      initChart()
+    }
 });
+
+onBeforeUnmount(() => {
+  window.removeEventListener('resize', resize)
+})
+
+const resize = () => {
+  if (myChart.value) {
+    myChart.value.resize();
+  }
+}
+
 const initChart = () => {
    nextTick(() => {
-        const myChart = echarts.init(proxy?.$refs[props.chartRef as string] as HTMLElement);
+        myChart.value = echarts.init(proxy?.$refs[props.chartRef as string] as HTMLElement);

-        myChart.clear();
-        myChart.setOption(options.value);
+        myChart.value.setOption(options.value);

-        window.addEventListener('resize', () => {
-            myChart.resize();
-        });
+        window.addEventListener('resize', resize);
    });
 };
+
 initChart();
 </script>
--- a/src/views/iframe/index.vue
+++ b/src/views/iframe/index.vue
@ -20,15 +20,12 @@ const handle = async (appId: string, url: string) => {
    const res = await getAppInfo_api(appId);
    let menuUrl: any = url;
    if (res.status === 200) {
-        // console.log(res.result);
        if (res.result.page.routeType === 'hash') {
-            menuUrl = `/%23/${url}`;
+            menuUrl = `${url}`;
        }
        if (res.result.provider === 'internal-standalone') {
-            //{baseUrl}/api/application/sso/{appId}/login?redirect={menuUrl}
            const urlStandalone = `${res.result.page.baseUrl}/api/application/sso/${appId}/login?redirect=${menuUrl}?layout=false`;
            iframeUrl.value = urlStandalone;
-            // console.log(urlStandalone);
        } else if (res.result.provider === 'internal-integrated') {
            const tokenUrl = `${
                res.result.page.baseUrl
@ -44,7 +41,12 @@ const handle = async (appId: string, url: string) => {
 watchEffect(() => {
    const params = route.path.split('/')?.[1];
    const url = route.path.split('/').slice(2).join('/');
-    console.log(params, url);
    handle(params, url);
 });
 </script>
+
+<style lang='less' scoped>
+:deep(.children-full-height) {
+  margin: 0 !important;
+}
+</style>
--- a/src/views/link/AccessConfig/components/Provider/index.vue
+++ b/src/views/link/AccessConfig/components/Provider/index.vue
@ -145,12 +145,12 @@ const click = (value: object) => {
        display: flex;
        width: calc(100% - 100px);
        .images {
-            width: 88px;
-            height: 88px;
+            width: 80px;
+            height: 80px;

            img {
-                width: 88px;
-                height: 88px;
+                width: 80px;
+                height: 80px;
            }
        }

--- a/src/views/link/DashBoard/components/TopCard.vue
+++ b/src/views/link/DashBoard/components/TopCard.vue
@ -47,6 +47,7 @@ import { serverNode } from '@/api/link/dashboard';
 import TopEchartsItemNode from './TopEchartsItemNode.vue';
 import { getWebSocket } from '@/utils/websocket';
 import { map } from 'rxjs/operators';
+import { isNoCommunity } from '@/utils/utils'

 const serverId = ref();
 const serverNodeOptions = ref<Array<any>>([]);
@ -103,6 +104,7 @@ const getData = () => {
 };

 onMounted(() => {
+    if (isNoCommunity) {
      serverNode().then((resp: any) => {
          if (resp.success) {
              serverNodeOptions.value = resp.result.map((item: any) => ({
@ -114,6 +116,7 @@ onMounted(() => {
              }
          }
      });
+    }
 });
 watch(
    () => serverId.value,
--- a/src/views/link/Protocol/Save/FileUpload.vue
+++ b/src/views/link/Protocol/Save/FileUpload.vue
@ -30,7 +30,7 @@ import { TOKEN_KEY } from '@/utils/variable';
 import { PROTOCOL_UPLOAD } from '@/api/link/protocol';
 import { onlyMessage } from '@/utils/comm';
 import type { UploadChangeParam, UploadProps } from 'ant-design-vue';
-import { notification as Notification } from 'ant-design-vue';
+import { notification as Notification } from 'jetlinks-ui-components';
 import { useSystem } from '@/store/system';

 const emit = defineEmits(['update:modelValue', 'change']);
--- a/src/views/link/Type/Detail/index.vue
+++ b/src/views/link/Type/Detail/index.vue
@ -1327,6 +1327,9 @@ const getSupports = async () => {
            label: item.name,
            value: item.id,
        }));
+        if (!typeOptions.value.every((item : any) => item.value === 'UDP')) {
+          formData.value.type = typeOptions.value[0].value
+        }
    }
 };

--- a/src/views/oauth/index.vue
+++ b/src/views/oauth/index.vue
@ -1,7 +1,7 @@
 <template>
+  <div class='oauth-warp'>
    <j-spin :spinning='spinning'>
-
-      <div class='oauth'>
+            <div class='oauth' v-if='!spinning'>
              <div class='oauth-header'>
                <div class='oauth-header-left'>
                  <img :src='logoImg' alt=''>
@ -66,6 +66,8 @@
              </div>
            </div>
    </j-spin>
+
+  </div>
 </template>

 <script setup lang='ts' name='Oauth'>
@ -145,15 +147,17 @@ const getLoginUser = async (data?: any) => {
      goOAuth2Fn(data)
    }
  } else if (res.status === 401) {
-    isLogin.value = false
-    getCode()
-    getApplication(data.client_id || params.value.client_id)
-  } else {
-    isLogin.value = false
-  }
    setTimeout(() => {
      spinning.value = false
    })
+    getCode()
+    getApplication(data.client_id || params.value.client_id)
+  } else {
+    setTimeout(() => {
+      spinning.value = false
+    })
+  }
+
 }

 const getQueryVariable = (variable: any) => {
@ -223,6 +227,13 @@ initPage()
 </script>

 <style scoped lang='less'>
+.oauth-warp {
+  height: 500px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
 .oauth {
  .oauth-header {
    display: flex;
--- a/src/views/rule-engine/Scene/Save/Device/DeviceList.vue
+++ b/src/views/rule-engine/Scene/Save/Device/DeviceList.vue
@ -34,7 +34,7 @@
      >
        <template #img>
          <slot name="img">
-            <img width='88' height='88' :src="slotProps.photoUrl || getImage('/device/instance/device-card.png')" />
+            <img width='80' height='80' :src="slotProps.photoUrl || getImage('/device/instance/device-card.png')" />
          </slot>
        </template>
        <template #content>
--- a/src/views/rule-engine/Scene/Save/Device/DeviceSelect.vue
+++ b/src/views/rule-engine/Scene/Save/Device/DeviceSelect.vue
@ -2,7 +2,7 @@
  <div class='device-select'>
    <TopCard :options='typeList' v-model:value='selectorModel' @select='select' />
    <DeviceList v-if='selectorModel === "fixed"' :productId='productId' :row-keys='devices' @update='updateDevice' />
-    <OrgList v-else-if='selectorModel === "org"' :productId='productId' :row-keys='orgIds' @update='updateOrg' />
+    <OrgList v-else-if='selectorModel === "org" && isNoCommunity' :productId='productId' :row-keys='orgIds' @update='updateOrg' />
  </div>
 </template>

@ -13,6 +13,7 @@ import OrgList from './OrgList.vue'
 import { getImage } from '@/utils/comm'
 import type { PropType } from 'vue'
 import { SelectorValuesItem } from '@/views/rule-engine/Scene/typings'
+import { isNoCommunity } from '@/utils/utils'

 type Emit = {
  (e: 'update:selector', data: string): void
@ -50,11 +51,14 @@ const selectorModel = ref(props.selector)
 const devices = ref(props.deviceKeys)
 const orgIds = ref(props.orgId)

-const typeList = [
+const typeList = ref([
  { label: '自定义', value: 'fixed', tip: '自定义选择当前产品下的任意设备', img: getImage('/scene/device-custom.png')},
  { label: '全部', value: 'all', tip: '产品下的所有设备', img: getImage('/scene/trigger-device-all.png')},
-  { label: '按组织', value: 'org', tip: '选择产品下归属于具体组织的设备', img: getImage('/scene/trigger-device-org.png')},
-]
+])
+
+if (isNoCommunity) {
+  typeList.value.push({ label: '按组织', value: 'org', tip: '选择产品下归属于具体组织的设备', img: getImage('/scene/trigger-device-org.png')},)
+}

 const select = (s: string) => {
  selectorModel.value = s
--- a/src/views/rule-engine/Scene/Save/Device/Product.vue
+++ b/src/views/rule-engine/Scene/Save/Device/Product.vue
@ -31,7 +31,7 @@
      >
        <template #img>
          <slot name="img">
-            <img width='88' height='88' :src="slotProps.photoUrl || getImage('/device-product.png')" />
+            <img width='80' height='80' :src="slotProps.photoUrl || getImage('/device-product.png')" />
          </slot>
        </template>
        <template #content>
--- a/src/views/system/Department/device/index.vue
+++ b/src/views/system/Department/device/index.vue
@ -4,6 +4,7 @@
            :columns="columns"
            target="category"
            @search="(params:any)=>queryParams = {...params}"
+            style='margin-bottom: 0;'
        />
        <FullPage>
            <j-pro-table
--- a/src/views/system/Department/index.vue
+++ b/src/views/system/Department/index.vue
@ -6,7 +6,7 @@
              <LeftTree @change="(id) => (departmentId = id)" />
            </div>
            <div class="right">
-              <j-tabs v-model:activeKey="activeKey" destroyInactiveTabPane>
+              <j-tabs v-if='isNoCommunity' v-model:activeKey="activeKey" destroyInactiveTabPane>
                <j-tab-pane key="product" tab="产品">
                  <Product
                    :parentId="departmentId"
@ -23,6 +23,7 @@
                  <User :parentId="departmentId" />
                </j-tab-pane>
              </j-tabs>
+              <User :parentId="departmentId" v-else />
            </div>
          </div>
        </div>
@ -34,6 +35,7 @@ import LeftTree from './components/LeftTree.vue';
 import Product from './product/index.vue';
 import Device from './device/index.vue';
 import User from './user/index.vue';
+import { isNoCommunity } from '@/utils/utils'

 const activeKey = ref<'product' | 'device' | 'user'>('product');

--- a/src/views/system/Department/product/index.vue
+++ b/src/views/system/Department/product/index.vue
@ -4,6 +4,7 @@
            :columns="columns"
            target="category"
            @search="(params:any)=>queryParams = {...params}"
+            style='margin-bottom: 0;'
        />
        <FullPage>
            <j-pro-table
--- a/src/views/system/Department/user/index.vue
+++ b/src/views/system/Department/user/index.vue
@ -4,6 +4,7 @@
            :columns="columns"
            target="category"
            @search="handleParams"
+            style='margin-bottom: 0;'
        />
        <FullPage>
            <j-pro-table
@ -31,6 +32,7 @@
                        :hasPermission="`${permission}:bind-user`"
                        @click="dialogVisible = true"
                        style="margin-right: 15px"
+                        :disabled='!parentId'
                    >
                        <AIcon type="PlusOutlined" />绑定用户
                    </PermissionButton>
--- a/src/views/system/Menu/Detail/BasicInfo.vue
+++ b/src/views/system/Menu/Detail/BasicInfo.vue
@ -242,6 +242,7 @@
                    route.params.id === ':id' ? 'add' : 'update'
                }`"
                @click="form.clickSave"
+                :loading='form.saveLoading'
            >
                保存
            </PermissionButton>
--- a/src/views/system/Menu/index.vue
+++ b/src/views/system/Menu/index.vue
@ -85,11 +85,17 @@ import { message } from 'jetlinks-ui-components';
 import dayjs from 'dayjs';
 import { useUserInfo } from '@/store/userInfo';
 import { MESSAGE_SUBSCRIBE_MENU_CODE, USER_CENTER_MENU_CODE } from '@/utils/consts'
-const admin = useUserInfo().userInfos?.type.id === 'admin';
+import { storeToRefs } from 'pinia';

 const permission = 'system/Menu';

 const router = useRouter();
+const userInfoStore = useUserInfo()
+const { userInfos } = storeToRefs(userInfoStore)
+
+const admin = computed(() => {
+  return userInfos.value?.username === 'admin';
+})

 const columns = [
    {
--- a/vite.config.ts
+++ b/vite.config.ts
@ -34,7 +34,7 @@ export default defineConfig(({ mode}) => {
      build: {
          outDir: 'dist',
          assetsDir: 'assets',
-          sourcemap: true,
+          sourcemap: false,
          cssCodeSplit: false,
          manifest: true,
          chunkSizeWarningLimit: 2000,
@ -92,9 +92,9 @@ export default defineConfig(({ mode}) => {

          proxy: {
              [env.VITE_APP_BASE_API]: {
-                  // target: 'http://192.168.32.226:8844',
+                  target: 'http://192.168.32.226:8844',
                  // target: 'http://192.168.32.244:8881',
-                  target: 'http://120.77.179.54:8844', // 120测试
+                  // target: 'http://120.77.179.54:8844', // 120测试
                //   target: 'http://192.168.33.46:8844', // 本地开发环境
                  ws: 'ws://192.168.33.46:8844',
                  changeOrigin: true,
--- a/yarn.lock
+++ b/yarn.lock
@ -3718,10 +3718,10 @@ jetlinks-store@^0.0.3:
  resolved "https://registry.npmjs.org/jetlinks-store/-/jetlinks-store-0.0.3.tgz"
  integrity sha512-AZf/soh1hmmwjBZ00fr1emuMEydeReaI6IBTGByQYhTmK1Zd5pQAxC7WLek2snRAn/HHDgJfVz2hjditKThl6Q==

-jetlinks-ui-components@^1.0.5:
+jetlinks-ui-components@1.0.5:
  version "1.0.5"
-  resolved "http://47.108.170.157:9013/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#dd86644756d6044c4842193ea72335688cfa77d5"
-  integrity sha512-NFjJRwFuluUEAuFguyLYidgFy3tDuh1lKg10uBR//zFxmIzRaGPNN1r9nt/hp3BIGdQLJHUKgDJXQX6fZmfARg==
+  resolved "https://registry.jetlinks.cn/jetlinks-ui-components/-/jetlinks-ui-components-1.0.5.tgz#9fa4680c69471ee9abf518782faf1b4c276aa305"
+  integrity sha512-pFZ0ol0jjIrrIEqPOFmrS5K623QzczYVMFPf8NQ3XeSBLksW9dncgVEPa6cZZ+9jjwAgWHo2MyPGXZcY6SF8PQ==
  dependencies:
    "@vueuse/core" "^9.12.0"
    "@vueuse/router" "^9.13.0"
@ -6419,13 +6419,6 @@ tough-cookie@~2.5.0:
    psl "^1.1.28"
    punycode "^2.1.1"

-treer@^1.0.4:
-  version "1.0.4"
-  resolved "http://registry.jetlinks.cn/treer/-/treer-1.0.4.tgz#3b5ff47baec11c97476b8b7712da71cf459d52a3"
-  integrity sha512-Q2oAOOxzGYq+/KoKT1bZSSwDL4Y4WYukjiYBAn6GrNlt1xKKf5JS216dsSzkPDoYTHA9CXdbYkehUG7F1JT+5A==
-  dependencies:
-    commander "^2.9.0"
-
 treeverse@^1.0.4:
  version "1.0.4"
  resolved "http://47.108.170.157:9013/treeverse/-/treeverse-1.0.4.tgz#a6b0ebf98a1bca6846ddc7ecbc900df08cb9cd5f"