eoss-ui 0.8.52 → 0.8.53

package/packages/wujie/src/main.vue

@@ -1,146 +1,160 @@
-<template>
-  <WujieVue
-    class="es-wujie"
-    v-if="show"
-    v-bind="$attrs"
-    :width="width"
-    :height="height"
-    :name="wujieName"
-    :loading="loading"
-    :sync="sync"
-    :prefix="prefix"
-    :alive="alive"
-    :props="defaultProps"
-    :replace="replace"
-    :fetch="fetch"
-    :fiber="fiber"
-    :degrade="degrade"
-    :plugins="defaultPlugins"
-    :beforeLoad="beforeLoad"
-    :beforeMount="beforeMount"
-    :afterMount="afterMount"
-    :beforeUnmount="beforeUnmount"
-    :afterUnmount="afterUnmount"
-    :activated="activated"
-    :deactivated="deactivated"
-    :loadError="loadError"
-    :attrs="attrs"
-    :url="defaultUrl"
-  ></WujieVue>
-</template>
-<script>
-import util from 'eoss-ui/src/utils/util.js';
-import WujieVue from 'wujie-vue2';
-export default {
-  name: 'EsWujie',
-  inheritAttrs: false,
-  inject: {},
-  props: {
-    width: { type: String, default: '100%' },
-    height: { type: String, default: '100%' },
-    name: { type: String, default: '' },
-    loading: { type: HTMLElement, default: undefined },
-    host: {
-      type: String,
-      default: ''
-    },
-    url: { type: String, default: '' },
-    sync: { type: Boolean, default: false },
-    prefix: { type: Object, default: undefined },
-    alive: { type: Boolean, default: false },
-    props: { type: Object, default: undefined },
-    replace: { type: Function, default: undefined },
-    fetch: { type: Function, default: undefined },
-    fiber: { type: Boolean, default: true },
-    degrade: { type: Boolean, default: false },
-    plugins: {
-      type: Array,
-      default() {
-        return [];
-      }
-    },
-    beforeLoad: { type: Function, default: null },
-    beforeMount: { type: Function, default: null },
-    afterMount: { type: Function, default: null },
-    beforeUnmount: { type: Function, default: null },
-    afterUnmount: { type: Function, default: null },
-    activated: { type: Function, default: null },
-    deactivated: { type: Function, default: null },
-    loadError: { type: Function, default: null },
-    param: Object,
-    attrs: {
-      type: Object,
-      default() {
-        return {
-          src: '#/empty'
-        };
-      }
-    },
-    show: Boolean,
-    dialog: Boolean,
-    appendTopBody: Boolean
-  },
-  data() {
-    return {
-      defaultUrl: '',
-      defaultPlugins: null
-    };
-  },
-  computed: {
-    wujieName() {
-      return this.name ? this.name : util.uuid(16);
-    },
-    defaultProps() {
-      let props = {};
-      if (this.url) {
-        let params = util.getParams({ url: this.url });
-        if (params) {
-          props = params;
-        }
-        let urls = this.url.split('?');
-        if (urls[0].indexOf('.js') > 1) {
-          if (this.dialog) {
-            props._dialog = true;
-            props._dialogId = this.wujieName;
-          }
-          props.appendTopBody = this.appendTopBody;
-        }
-      }
-      return { ...props, ...this.$attrs, ...this.props };
-    }
-  },
-  watch: {
-    url: {
-      immediate: true,
-      handler(val) {
-        if (val) {
-          let urls = val.split('?');
-          let plugins = this.plugins;
-          let defaultUrl = '';
-          if (urls[0].indexOf('.js') > 1) {
-            defaultUrl = this.param
-              ? util.urlJoinParams({
-                  url: './primary.html',
-                  param: this.param,
-                  timestamp: true
-                })
-              : util.handlerUrl('./primary.html');
-            plugins.push({
-              jsBeforeLoaders: [{ src: val }]
-            });
-          } else {
-            defaultUrl = val;
-          }
-          this.defaultUrl = util.startWith(defaultUrl, 'http')
-            ? defaultUrl
-            : this.host + defaultUrl;
-          this.defaultPlugins = plugins;
-        }
-      }
-    }
-  },
-  created() {},
-  mounted() {},
-  methods: {}
-};
-</script>
+<template>
+  <WujieVue
+    class="es-wujie"
+    v-if="show"
+    v-bind="$attrs"
+    :width="width"
+    :height="height"
+    :name="wujieName"
+    :loading="loading"
+    :sync="sync"
+    :prefix="prefix"
+    :alive="alive"
+    :props="defaultProps"
+    :replace="replace"
+    :fetch="fetch"
+    :fiber="fiber"
+    :degrade="degrade"
+    :plugins="mergedPlugins"
+    :beforeLoad="beforeLoad"
+    :beforeMount="beforeMount"
+    :afterMount="afterMount"
+    :beforeUnmount="beforeUnmount"
+    :afterUnmount="afterUnmount"
+    :activated="activated"
+    :deactivated="deactivated"
+    :loadError="loadError"
+    :attrs="attrs"
+    :url="defaultUrl"
+  ></WujieVue>
+</template>
+<script>
+import util from 'eoss-ui/src/utils/util.js';
+import WujieVue from 'wujie-vue2';
+// 修正子应用 popper 类组件（dialog、select 下拉等）定位：
+// 沙箱内 documentElement / window 尺寸为 iframe 的值，与主应用视口不一致导致偏移
+import { DocElementRectPlugin, WindowSizePlugin } from 'wujie-polyfill';
+export default {
+  name: 'EsWujie',
+  inheritAttrs: false,
+  inject: {},
+  props: {
+    width: { type: String, default: '100%' },
+    height: { type: String, default: '100%' },
+    name: { type: String, default: '' },
+    loading: { type: HTMLElement, default: undefined },
+    host: {
+      type: String,
+      default: ''
+    },
+    url: { type: String, default: '' },
+    sync: { type: Boolean, default: false },
+    prefix: { type: Object, default: undefined },
+    alive: { type: Boolean, default: false },
+    props: { type: Object, default: undefined },
+    replace: { type: Function, default: undefined },
+    fetch: { type: Function, default: undefined },
+    fiber: { type: Boolean, default: true },
+    degrade: { type: Boolean, default: false },
+    plugins: {
+      type: Array,
+      default() {
+        return [];
+      }
+    },
+    beforeLoad: { type: Function, default: null },
+    beforeMount: { type: Function, default: null },
+    afterMount: { type: Function, default: null },
+    beforeUnmount: { type: Function, default: null },
+    afterUnmount: { type: Function, default: null },
+    activated: { type: Function, default: null },
+    deactivated: { type: Function, default: null },
+    loadError: { type: Function, default: null },
+    param: Object,
+    attrs: {
+      type: Object,
+      default() {
+        return {
+          src: '#/empty'
+        };
+      }
+    },
+    show: Boolean,
+    dialog: Boolean,
+    appendTopBody: Boolean
+  },
+  data() {
+    return {
+      defaultUrl: '',
+      defaultPlugins: null
+    };
+  },
+  computed: {
+    wujieName() {
+      return this.name ? this.name : util.uuid(16);
+    },
+    defaultProps() {
+      let props = {};
+      if (this.url) {
+        let params = util.getParams({ url: this.url });
+        if (params) {
+          props = params;
+        }
+        let urls = this.url.split('?');
+        if (urls[0].indexOf('.js') > 1) {
+          if (this.dialog) {
+            props._dialog = true;
+            props._dialogId = this.wujieName;
+          }
+          props.appendTopBody = this.appendTopBody;
+        }
+      }
+      return { ...props, ...this.$attrs, ...this.props };
+    },
+    /**
+     * 合并用户插件与内部插件：
+     * 注入 wujie-polyfill 的 DocElementRectPlugin / WindowSizePlugin，
+     * 修正沙箱内 documentElement / window 尺寸，保证子应用 popper 类组件定位与主应用视口一致
+     */
+    mergedPlugins() {
+      return (this.defaultPlugins || []).concat([
+        DocElementRectPlugin(),
+        WindowSizePlugin()
+      ]);
+    }
+  },
+  watch: {
+    url: {
+      immediate: true,
+      handler(val) {
+        if (val) {
+          let urls = val.split('?');
+          let plugins = this.plugins;
+          let defaultUrl = '';
+          if (urls[0].indexOf('.js') > 1) {
+            defaultUrl = this.param
+              ? util.urlJoinParams({
+                  url: './primary.html',
+                  param: this.param,
+                  timestamp: true
+                })
+              : util.handlerUrl('./primary.html');
+            plugins.push({
+              jsBeforeLoaders: [{ src: val }]
+            });
+          } else {
+            defaultUrl = val;
+          }
+          this.defaultUrl = util.startWith(defaultUrl, 'http')
+            ? defaultUrl
+            : this.host + defaultUrl;
+          this.defaultPlugins = plugins;
+        }
+      }
+    }
+  },
+  created() {},
+  mounted() {},
+  methods: {}
+};
+</script>

package/src/index.js

@@ -1,118 +1,118 @@
 /* Automatically generated by './build/bin/build-entry.js' */
 
-import Archives from '../packages/archives/index.js';
-import Button from '../packages/button/index.js';
-import ButtonGroup from '../packages/button-group/index.js';
-import Calendar from '../packages/calendar/index.js';
-import Calogin from '../packages/calogin/index.js';
-import Card from '../packages/card/index.js';
-import Cascader from '../packages/cascader/index.js';
-import CheckboxGroup from '../packages/checkbox-group/index.js';
-import Clients from '../packages/clients/index.js';
-import DataTable from '../packages/data-table/index.js';
-import DataTableForm from '../packages/data-table-form/index.js';
-import DatePicker from '../packages/date-picker/index.js';
-import Dialog from '../packages/dialog/index.js';
-import EnableDrag from '../packages/enable-drag/index.js';
-import Enterprise from '../packages/enterprise/index.js';
-import ErrorPage from '../packages/error-page/index.js';
-import Form from '../packages/form/index.js';
-import Flow from '../packages/flow/index.js';
-import FlowGroup from '../packages/flow-group/index.js';
-import FlowList from '../packages/flow-list/index.js';
-import HandleUser from '../packages/handle-user/index.js';
-import Handler from '../packages/handler/index.js';
-import Icon from '../packages/icon/index.js';
-import Icons from '../packages/icons/index.js';
-import Input from '../packages/input/index.js';
-import InputNumber from '../packages/input-number/index.js';
-import Label from '../packages/label/index.js';
-import Layout from '../packages/layout/index.js';
-import Login from '../packages/login/index.js';
-import Main from '../packages/main/index.js';
-import Menu from '../packages/menu/index.js';
-import Nav from '../packages/nav/index.js';
-import Notify from '../packages/notify/index.js';
-import Pagination from '../packages/pagination/index.js';
-import Page from '../packages/page/index.js';
-import Player from '../packages/player/index.js';
-import QrCode from '../packages/qr-code/index.js';
-import RadioGroup from '../packages/radio-group/index.js';
-import RetrialAuth from '../packages/retrial-auth/index.js';
-import Select from '../packages/select/index.js';
-import SelectGanged from '../packages/select-ganged/index.js';
-import Selector from '../packages/selector/index.js';
-import SelectorPanel from '../packages/selector-panel/index.js';
-import Sizer from '../packages/sizer/index.js';
-import Steps from '../packages/steps/index.js';
-import Switch from '../packages/switch/index.js';
-import Tabs from '../packages/tabs/index.js';
-import TabsPanel from '../packages/tabs-panel/index.js';
-import Tips from '../packages/tips/index.js';
-import Tree from '../packages/tree/index.js';
-import TreeGroup from '../packages/tree-group/index.js';
-import Toolbar from '../packages/toolbar/index.js';
-import TableForm from '../packages/table-form/index.js';
-import Upload from '../packages/upload/index.js';
-import Wujie from '../packages/wujie/index.js';
+import Archives from '../packages/archives/index.js';
+import Button from '../packages/button/index.js';
+import ButtonGroup from '../packages/button-group/index.js';
+import Calendar from '../packages/calendar/index.js';
+import Calogin from '../packages/calogin/index.js';
+import Card from '../packages/card/index.js';
+import Cascader from '../packages/cascader/index.js';
+import CheckboxGroup from '../packages/checkbox-group/index.js';
+import Clients from '../packages/clients/index.js';
+import DataTable from '../packages/data-table/index.js';
+import DataTableForm from '../packages/data-table-form/index.js';
+import DatePicker from '../packages/date-picker/index.js';
+import Dialog from '../packages/dialog/index.js';
+import EnableDrag from '../packages/enable-drag/index.js';
+import Enterprise from '../packages/enterprise/index.js';
+import ErrorPage from '../packages/error-page/index.js';
+import Form from '../packages/form/index.js';
+import Flow from '../packages/flow/index.js';
+import FlowGroup from '../packages/flow-group/index.js';
+import FlowList from '../packages/flow-list/index.js';
+import HandleUser from '../packages/handle-user/index.js';
+import Handler from '../packages/handler/index.js';
+import Icon from '../packages/icon/index.js';
+import Icons from '../packages/icons/index.js';
+import Input from '../packages/input/index.js';
+import InputNumber from '../packages/input-number/index.js';
+import Label from '../packages/label/index.js';
+import Layout from '../packages/layout/index.js';
+import Login from '../packages/login/index.js';
+import Main from '../packages/main/index.js';
+import Menu from '../packages/menu/index.js';
+import Nav from '../packages/nav/index.js';
+import Notify from '../packages/notify/index.js';
+import Pagination from '../packages/pagination/index.js';
+import Page from '../packages/page/index.js';
+import Player from '../packages/player/index.js';
+import QrCode from '../packages/qr-code/index.js';
+import RadioGroup from '../packages/radio-group/index.js';
+import RetrialAuth from '../packages/retrial-auth/index.js';
+import Select from '../packages/select/index.js';
+import SelectGanged from '../packages/select-ganged/index.js';
+import Selector from '../packages/selector/index.js';
+import SelectorPanel from '../packages/selector-panel/index.js';
+import Sizer from '../packages/sizer/index.js';
+import Steps from '../packages/steps/index.js';
+import Switch from '../packages/switch/index.js';
+import Tabs from '../packages/tabs/index.js';
+import TabsPanel from '../packages/tabs-panel/index.js';
+import Tips from '../packages/tips/index.js';
+import Tree from '../packages/tree/index.js';
+import TreeGroup from '../packages/tree-group/index.js';
+import Toolbar from '../packages/toolbar/index.js';
+import TableForm from '../packages/table-form/index.js';
+import Upload from '../packages/upload/index.js';
+import Wujie from '../packages/wujie/index.js';
 import Wxlogin from '../packages/wxlogin/index.js';
 
 const components = [
-  Archives,
-  Button,
-  ButtonGroup,
-  Calendar,
-  Calogin,
-  Card,
-  Cascader,
-  CheckboxGroup,
-  Clients,
-  DataTable,
-  DataTableForm,
-  DatePicker,
-  Dialog,
-  EnableDrag,
-  Enterprise,
-  ErrorPage,
-  Form,
-  Flow,
-  FlowGroup,
-  FlowList,
-  HandleUser,
-  Handler,
-  Icon,
-  Icons,
-  Input,
-  InputNumber,
-  Label,
-  Layout,
-  Login,
-  Main,
-  Menu,
-  Nav,
-  Notify,
-  Pagination,
-  Page,
-  Player,
-  QrCode,
-  RadioGroup,
-  RetrialAuth,
-  Select,
-  SelectGanged,
-  Selector,
-  SelectorPanel,
-  Sizer,
-  Steps,
-  Switch,
-  Tabs,
-  TabsPanel,
-  Tips,
-  Tree,
-  TreeGroup,
-  Toolbar,
-  TableForm,
-  Upload,
-  Wujie,
+  Archives,
+  Button,
+  ButtonGroup,
+  Calendar,
+  Calogin,
+  Card,
+  Cascader,
+  CheckboxGroup,
+  Clients,
+  DataTable,
+  DataTableForm,
+  DatePicker,
+  Dialog,
+  EnableDrag,
+  Enterprise,
+  ErrorPage,
+  Form,
+  Flow,
+  FlowGroup,
+  FlowList,
+  HandleUser,
+  Handler,
+  Icon,
+  Icons,
+  Input,
+  InputNumber,
+  Label,
+  Layout,
+  Login,
+  Main,
+  Menu,
+  Nav,
+  Notify,
+  Pagination,
+  Page,
+  Player,
+  QrCode,
+  RadioGroup,
+  RetrialAuth,
+  Select,
+  SelectGanged,
+  Selector,
+  SelectorPanel,
+  Sizer,
+  Steps,
+  Switch,
+  Tabs,
+  TabsPanel,
+  Tips,
+  Tree,
+  TreeGroup,
+  Toolbar,
+  TableForm,
+  Upload,
+  Wujie,
   Wxlogin
 ];
 
@@ -127,62 +127,62 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.8.52',
+  version: '0.8.53',
   install,
-  Archives,
-  Button,
-  ButtonGroup,
-  Calendar,
-  Calogin,
-  Card,
-  Cascader,
-  CheckboxGroup,
-  Clients,
-  DataTable,
-  DataTableForm,
-  DatePicker,
-  Dialog,
-  EnableDrag,
-  Enterprise,
-  ErrorPage,
-  Form,
-  Flow,
-  FlowGroup,
-  FlowList,
-  HandleUser,
-  Handler,
-  Icon,
-  Icons,
-  Input,
-  InputNumber,
-  Label,
-  Layout,
-  Login,
-  Main,
-  Menu,
-  Nav,
-  Notify,
-  Pagination,
-  Page,
-  Player,
-  QrCode,
-  RadioGroup,
-  RetrialAuth,
-  Select,
-  SelectGanged,
-  Selector,
-  SelectorPanel,
-  Sizer,
-  Steps,
-  Switch,
-  Tabs,
-  TabsPanel,
-  Tips,
-  Tree,
-  TreeGroup,
-  Toolbar,
-  TableForm,
-  Upload,
-  Wujie,
+  Archives,
+  Button,
+  ButtonGroup,
+  Calendar,
+  Calogin,
+  Card,
+  Cascader,
+  CheckboxGroup,
+  Clients,
+  DataTable,
+  DataTableForm,
+  DatePicker,
+  Dialog,
+  EnableDrag,
+  Enterprise,
+  ErrorPage,
+  Form,
+  Flow,
+  FlowGroup,
+  FlowList,
+  HandleUser,
+  Handler,
+  Icon,
+  Icons,
+  Input,
+  InputNumber,
+  Label,
+  Layout,
+  Login,
+  Main,
+  Menu,
+  Nav,
+  Notify,
+  Pagination,
+  Page,
+  Player,
+  QrCode,
+  RadioGroup,
+  RetrialAuth,
+  Select,
+  SelectGanged,
+  Selector,
+  SelectorPanel,
+  Sizer,
+  Steps,
+  Switch,
+  Tabs,
+  TabsPanel,
+  Tips,
+  Tree,
+  TreeGroup,
+  Toolbar,
+  TableForm,
+  Upload,
+  Wujie,
   Wxlogin
 };