vue2-client 1.18.54 → 1.18.56

package/src/components/xScrollBox/index.vue

@@ -5,21 +5,32 @@
 </template>
 
 <script>
+import { isMicroAppEnv } from '@vue2-client/utils/microAppUtils'
+
 export default {
   name: 'XScrollBox',
-  data () {
+  data() {
     return {
       scrollBoxRef: null
     }
   },
   computed: {
     // 判断当前是否为 blank 模式
-    isBlankMode () {
+    isBlankMode() {
       return process.env.VUE_APP_SINGLE_PAPER === 'TRUE'
     },
-    computedStyle () {
+    computedStyle() {
       if (this.isBlankMode) {
-        // blank 模式下使用 100%
+        // blank 模式下，如果是微应用环境，使用父级 CSS 变量
+        if (isMicroAppEnv()) {
+          return {
+            height: 'var(--parent-scroll-height, 100%)',
+            maxHeight: 'var(--parent-scroll-height, 100%)',
+            minHeight: 'var(--parent-scroll-height, 100%)',
+            overflow: 'auto'
+          }
+        }
+        // 非微应用环境使用 100%
         return {
           height: '100%',
           maxHeight: '100%',
@@ -36,7 +47,7 @@ export default {
       }
     }
   },
-  mounted () {
+  mounted() {
     // 获取滚动容器引用
     this.scrollBoxRef = this.$el
   },
@@ -45,7 +56,7 @@ export default {
      * 滚动到顶部
      * @param {boolean} smooth - 是否平滑滚动，默认 true
      */
-    scrollToTop (smooth = true) {
+    scrollToTop(smooth = true) {
       if (this.scrollBoxRef) {
         this.scrollBoxRef.scrollTo({
           top: 0,
@@ -61,7 +72,7 @@ export default {
      * @param {number} left - 水平位置，默认 0
      * @param {boolean} smooth - 是否平滑滚动，默认 true
      */
-    scrollTo (top, left = 0, smooth = true) {
+    scrollTo(top, left = 0, smooth = true) {
       if (this.scrollBoxRef) {
         this.scrollBoxRef.scrollTo({
           top,
@@ -75,7 +86,7 @@ export default {
      * 获取当前滚动位置
      * @returns {Object} - { scrollTop, scrollLeft }
      */
-    getScrollPosition () {
+    getScrollPosition() {
       if (this.scrollBoxRef) {
         return {
           scrollTop: this.scrollBoxRef.scrollTop,

package/src/layouts/CommonLayout.vue

@@ -1,56 +1,56 @@
-<template>
-  <div class="common-layout">
-    <div class="top"><a class="clearCacheBtn" @click="clearCache">清除缓存</a></div>
-    <div class="content"><slot></slot></div>
-    <page-footer :link-list="footerLinks" :copyright="copyright" :copyrightStyle="copyrightStyle"></page-footer>
-  </div>
-</template>
-
-<script>
-import PageFooter from '@vue2-client/layouts/footer/PageFooter'
-import { mapState } from 'vuex'
-import { indexedDB } from '@vue2-client/utils/indexedDB'
-
-export default {
-  name: 'CommonLayout',
-  components: { PageFooter },
-  computed: {
-    ...mapState('setting', ['footerLinks', 'copyright', 'copyrightStyle'])
-  },
-  methods: {
-    clearCache () {
-      indexedDB.clearCache()
-    }
-  }
-}
-</script>
-
-<style scoped lang="less">
-.common-layout{
-  display: flex;
-  flex-direction: column;
-  height: 100vh;
-  overflow: auto;
-  background-color: @layout-body-background;
-  background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg');
-  background-repeat: no-repeat;
-  background-position-x: center;
-  background-position-y: 110px;
-  background-size: 100%;
-  .top {
-    padding: 5px 10px;
-    text-align: right;
-    .clearCacheBtn {
-      color: #fff !important;
-    }
-  }
-  .content{
-    padding: 32px 0;
-    flex: 1;
-    @media (min-width: 768px){
-
-      padding: 112px 0 24px;
-    }
-  }
-}
-</style>
+<template>
+  <div class="common-layout">
+    <div class="top"><a class="clearCacheBtn" @click="clearCache">清除缓存</a></div>
+    <div class="content"><slot></slot></div>
+    <page-footer :link-list="footerLinks" :copyright="copyright" :copyrightStyle="copyrightStyle"></page-footer>
+  </div>
+</template>
+
+<script>
+import PageFooter from '@vue2-client/layouts/footer/PageFooter'
+import { mapState } from 'vuex'
+import { indexedDB } from '@vue2-client/utils/indexedDB'
+
+export default {
+  name: 'CommonLayout',
+  components: { PageFooter },
+  computed: {
+    ...mapState('setting', ['footerLinks', 'copyright', 'copyrightStyle'])
+  },
+  methods: {
+    clearCache () {
+      indexedDB.clearCache()
+    }
+  }
+}
+</script>
+
+<style scoped lang="less">
+.common-layout{
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  overflow: auto;
+  background-color: @layout-body-background;
+  background-image: url('https://gw.alipayobjects.com/zos/rmsportal/TVYTbAXWheQpRcWDaDMu.svg');
+  background-repeat: no-repeat;
+  background-position-x: center;
+  background-position-y: 110px;
+  background-size: 100%;
+  .top {
+    padding: 5px 10px;
+    text-align: right;
+    .clearCacheBtn {
+      color: #fff !important;
+    }
+  }
+  .content{
+    padding: 32px 0;
+    flex: 1;
+    @media (min-width: 768px){
+
+      padding: 112px 0 24px;
+    }
+  }
+}
+</style>

package/src/layouts/header/HeaderNotice.vue

@@ -1,177 +1,177 @@
-<template>
-  <div>
-    <a-drawer
-      :closable="false"
-      :visible="institutionDetailVisible"
-      :width="screenWidth * 0.5"
-      placement="right"
-      @close="onClose"
-    >
-      <institution-detail
-        :affirmInstitution="affirmInstitution"
-        :institutionId="institution"
-        @get_to_be_confirmed="getToBeConfirmed"/>
-    </a-drawer>
-    <a-dropdown v-model="show" :trigger="['click']">
-      <div slot="overlay">
-        <a-spin :spinning="loading">
-          <a-tabs
-            v-model="activeKey"
-            :style="{width: '500px'}"
-            :tabBarStyle="{textAlign: 'center'}"
-            class="dropdown-tabs">
-            <a-tab-pane key="1" tab="通知">
-              <a-list class="tab-pane">
-              </a-list>
-            </a-tab-pane>
-            <a-tab-pane key="2" tab="消息">
-              <a-list class="tab-pane"></a-list>
-            </a-tab-pane>
-            <a-tab-pane key="3" tab="待办">
-              <a-list :data-source="backlog" class="tab-pane" item-layout="horizontal" :pagination="pagination">
-                <a-list-item slot="renderItem" slot-scope="item">
-                  <a v-if="item.type==='制度待确认'" slot="actions" @click="confirm_institution(item)">查看</a>
-                  <a-list-item-meta :description="item.description" :title="item.title"/>
-                </a-list-item>
-              </a-list>
-            </a-tab-pane>
-          </a-tabs>
-        </a-spin>
-      </div>
-      <span class="header-notice" @click="fetchNotice">
-        <a-badge :count="backlog.length" class="notice-badge">
-          <a-icon :class="['header-notice-icon']" type="bell"/>
-        </a-badge>
-      </span>
-    </a-dropdown>
-  </div>
-</template>
-
-<script>
-import { post } from '@vue2-client/services/api'
-import InstitutionDetail from './InstitutionDetail'
-import ellipsis from '@vue2-client/components/Ellipsis'
-
-export default {
-  name: 'HeaderNotice',
-  data () {
-    return {
-      loading: false,
-      screenWidth: document.documentElement.clientWidth,
-      show: false,
-      institutionDetailVisible: false,
-      institution: undefined,
-      affirmInstitution: undefined,
-      backlog: [],
-      pagination: {
-        onChange: page => {
-          console.log(page)
-        },
-        pageSize: 5
-      },
-      activeKey: '1'
-    }
-  },
-  components: { InstitutionDetail },
-  computed: {},
-  created () {
-    this.getToBeConfirmed()
-  },
-  methods: {
-    onClose () {
-      this.institutionDetailVisible = false
-      this.getToBeConfirmed()
-    },
-    getToBeConfirmed () {
-      this.institutionDetailVisible = false
-      try {
-        if (this.$login.f.name) {
-          post('/api/af-system/logic/getTodo', { name: this.$login.f.name }).then(res => {
-            this.backlog = [...res]
-            if (this.backlog.length > 0) {
-              const key = `open${Date.now()}`
-              this.$notification.open({
-                key,
-                message: `您有${this.backlog.length}条待办需要确认`,
-                top: '50px',
-                description: <ellipsis length="200">{ this.backlog.map((item, index) => index + 1 + '、' + item.title).join('；') }</ellipsis>,
-                icon: <a-icon type="container" style="color: #f5222d"/>,
-                btn: h => {
-                  return h(
-                    'a-button',
-                    {
-                      props: {
-                        type: 'primary',
-                        size: 'small',
-                      },
-                      on: {
-                        click: () => this.viewBacklog(key),
-                      },
-                    },
-                    '查看',
-                  )
-                }
-              })
-            }
-          })
-        }
-      } catch (e) {
-        console.log(e)
-      }
-    },
-    viewBacklog (key) {
-      this.$notification.close(key)
-      this.show = true
-      this.activeKey = '3'
-    },
-    confirm_institution (item) {
-      this.institutionDetailVisible = true
-      this.show = false
-      this.institution = item.institution
-      this.affirmInstitution = item.id
-    },
-    fetchNotice () {
-      if (this.loading) {
-        this.loading = false
-        return
-      }
-      if (this.show) return
-      this.loading = true
-      setTimeout(() => {
-        this.loading = false
-      }, 1000)
-    }
-  }
-}
-</script>
-
-<style lang="less">
-.header-notice {
-  display: inline-block;
-  transition: all 0.3s;
-
-  span {
-    vertical-align: initial;
-  }
-
-  .notice-badge {
-    color: inherit;
-
-    .header-notice-icon {
-      font-size: 16px;
-      padding: 4px;
-    }
-  }
-}
-
-.dropdown-tabs {
-  background-color: @base-bg-color;
-  box-shadow: 0 2px 8px @shadow-color;
-  border-radius: 4px;
-
-  .tab-pane {
-    padding: 0 24px 12px;
-    min-height: 250px;
-  }
-}
-</style>
+<template>
+  <div>
+    <a-drawer
+      :closable="false"
+      :visible="institutionDetailVisible"
+      :width="screenWidth * 0.5"
+      placement="right"
+      @close="onClose"
+    >
+      <institution-detail
+        :affirmInstitution="affirmInstitution"
+        :institutionId="institution"
+        @get_to_be_confirmed="getToBeConfirmed"/>
+    </a-drawer>
+    <a-dropdown v-model="show" :trigger="['click']">
+      <div slot="overlay">
+        <a-spin :spinning="loading">
+          <a-tabs
+            v-model="activeKey"
+            :style="{width: '500px'}"
+            :tabBarStyle="{textAlign: 'center'}"
+            class="dropdown-tabs">
+            <a-tab-pane key="1" tab="通知">
+              <a-list class="tab-pane">
+              </a-list>
+            </a-tab-pane>
+            <a-tab-pane key="2" tab="消息">
+              <a-list class="tab-pane"></a-list>
+            </a-tab-pane>
+            <a-tab-pane key="3" tab="待办">
+              <a-list :data-source="backlog" class="tab-pane" item-layout="horizontal" :pagination="pagination">
+                <a-list-item slot="renderItem" slot-scope="item">
+                  <a v-if="item.type==='制度待确认'" slot="actions" @click="confirm_institution(item)">查看</a>
+                  <a-list-item-meta :description="item.description" :title="item.title"/>
+                </a-list-item>
+              </a-list>
+            </a-tab-pane>
+          </a-tabs>
+        </a-spin>
+      </div>
+      <span class="header-notice" @click="fetchNotice">
+        <a-badge :count="backlog.length" class="notice-badge">
+          <a-icon :class="['header-notice-icon']" type="bell"/>
+        </a-badge>
+      </span>
+    </a-dropdown>
+  </div>
+</template>
+
+<script>
+import { post } from '@vue2-client/services/api'
+import InstitutionDetail from './InstitutionDetail'
+import ellipsis from '@vue2-client/components/Ellipsis'
+
+export default {
+  name: 'HeaderNotice',
+  data () {
+    return {
+      loading: false,
+      screenWidth: document.documentElement.clientWidth,
+      show: false,
+      institutionDetailVisible: false,
+      institution: undefined,
+      affirmInstitution: undefined,
+      backlog: [],
+      pagination: {
+        onChange: page => {
+          console.log(page)
+        },
+        pageSize: 5
+      },
+      activeKey: '1'
+    }
+  },
+  components: { InstitutionDetail },
+  computed: {},
+  created () {
+    this.getToBeConfirmed()
+  },
+  methods: {
+    onClose () {
+      this.institutionDetailVisible = false
+      this.getToBeConfirmed()
+    },
+    getToBeConfirmed () {
+      this.institutionDetailVisible = false
+      try {
+        if (this.$login.f.name) {
+          post('/api/af-system/logic/getTodo', { name: this.$login.f.name }).then(res => {
+            this.backlog = [...res]
+            if (this.backlog.length > 0) {
+              const key = `open${Date.now()}`
+              this.$notification.open({
+                key,
+                message: `您有${this.backlog.length}条待办需要确认`,
+                top: '50px',
+                description: <ellipsis length="200">{ this.backlog.map((item, index) => index + 1 + '、' + item.title).join('；') }</ellipsis>,
+                icon: <a-icon type="container" style="color: #f5222d"/>,
+                btn: h => {
+                  return h(
+                    'a-button',
+                    {
+                      props: {
+                        type: 'primary',
+                        size: 'small',
+                      },
+                      on: {
+                        click: () => this.viewBacklog(key),
+                      },
+                    },
+                    '查看',
+                  )
+                }
+              })
+            }
+          })
+        }
+      } catch (e) {
+        console.log(e)
+      }
+    },
+    viewBacklog (key) {
+      this.$notification.close(key)
+      this.show = true
+      this.activeKey = '3'
+    },
+    confirm_institution (item) {
+      this.institutionDetailVisible = true
+      this.show = false
+      this.institution = item.institution
+      this.affirmInstitution = item.id
+    },
+    fetchNotice () {
+      if (this.loading) {
+        this.loading = false
+        return
+      }
+      if (this.show) return
+      this.loading = true
+      setTimeout(() => {
+        this.loading = false
+      }, 1000)
+    }
+  }
+}
+</script>
+
+<style lang="less">
+.header-notice {
+  display: inline-block;
+  transition: all 0.3s;
+
+  span {
+    vertical-align: initial;
+  }
+
+  .notice-badge {
+    color: inherit;
+
+    .header-notice-icon {
+      font-size: 16px;
+      padding: 4px;
+    }
+  }
+}
+
+.dropdown-tabs {
+  background-color: @base-bg-color;
+  box-shadow: 0 2px 8px @shadow-color;
+  border-radius: 4px;
+
+  .tab-pane {
+    padding: 0 24px 12px;
+    min-height: 250px;
+  }
+}
+</style>

package/src/lib.js

@@ -1 +1 @@
-console.log('进入模块')
+console.log('进入模块')