eoss 0.1.0-alpha.20 → 0.1.0-alpha.21

package/packages/theme-chalk/src/tabs.scss

@@ -74,14 +74,9 @@
     position: relative;
   }
   @include e(nav-wrap) {
+    flex: 1;
     box-sizing: border-box;
-    padding: 0 20px;
     overflow: hidden;
-    position: absolute;
-    left: 0;
-    top: 0;
-    right: 0;
-    bottom: 0;
     &:not(.is-hide)::after {
       content: '';
       position: absolute;
@@ -266,7 +261,6 @@
       background-color: $--background-color-base;
       border-bottom: 1px solid #fff;
       margin: 0;
-      padding-top: 9px;
     }
     > .es-tabs__header .es-tabs__nav-wrap::after {
       content: none;
@@ -290,31 +284,6 @@
         background-color: $--color-white;
         border-right-color: $--color-white;
         border-left-color: $--color-white;
-        border-top-left-radius: 8px;
-        border-top-right-radius: 8px;
-        &:before {
-          content: '';
-          position: absolute;
-          bottom: -1px;
-          width: 8px;
-          height: 8px;
-          background-color: #f5f5f5;
-          left: -9px;
-          border-radius: 0 0 8px 0;
-          box-shadow: 4px 0 0 0 #ffffff;
-        }
-        &::after {
-          content: '';
-          position: absolute;
-          bottom: -1px;
-          width: 8px;
-          height: 8px;
-          background: #f5f5f5;
-          right: -9px;
-          border-radius: 0 0 0 8px;
-          box-shadow: -4px 0 0 0 #ffffff;
-          z-index: 1;
-        }
       }
       &:not(.is-disabled):hover {
         color: $--color-primary;
@@ -330,9 +299,7 @@
   }
   @include m((top, bottom)) {
     &.es-tabs--border-card,
-    &.es-tabs--card,
-    .es-tabs--left,
-    .es-tabs--right {
+    &.es-tabs--card {
       > .es-tabs__header {
         .es-tabs__item:nth-child(2) {
           padding-left: 20px;
@@ -342,6 +309,46 @@
         }
       }
     }
+    .es-tabs__nav-wrap {
+      min-width: 0;
+      &.is-scrollable {
+        padding: 0 20px;
+      }
+    }
+  }
+  @include m(top) {
+    &.es-tabs--border-card {
+      & > .es-tabs__header {
+        padding-top: 9px;
+        .es-tabs__nav {
+          padding: 0 8px;
+        }
+        .es-tabs__item.is-active {
+          border-top-left-radius: 8px;
+          border-top-right-radius: 8px;
+          &:before,
+          &::after {
+            content: '';
+            position: absolute;
+            width: 8px;
+            height: 8px;
+            background-color: #f5f5f5;
+          }
+          &:before {
+            border-radius: 0 0 8px 0;
+            bottom: -1px;
+            left: -9px;
+            box-shadow: 4px 0 0 0 #ffffff;
+          }
+          &::after {
+            border-radius: 0 0 0 8px;
+            bottom: -1px;
+            right: -9px;
+            box-shadow: -4px 0 0 0 #ffffff;
+          }
+        }
+      }
+    }
   }
   @include m(bottom) {
     .es-tabs__header.is-bottom {
@@ -349,7 +356,11 @@
       margin-top: 10px;
     }
     &.es-tabs--border-card {
+      .es-tabs__nav {
+        padding: 0 8px;
+      }
       .es-tabs__header.is-bottom {
+        padding-bottom: 9px;
         border-bottom: 0;
         border-top: 1px solid $--border-color-base;
       }
@@ -357,11 +368,38 @@
         margin-top: -1px;
         margin-bottom: 0;
       }
-      .es-tabs__item.is-bottom:not(.is-active) {
-        border: 1px solid transparent;
-      }
-      .es-tabs__item.is-bottom {
-        margin: 0 -1px -1px -1px;
+      .es-tabs__item {
+        &.is-bottom {
+          margin: 0 -1px -1px -1px;
+          &:not(.is-active) {
+            border: 1px solid transparent;
+          }
+        }
+
+        &.is-active {
+          border-bottom-left-radius: 8px;
+          border-bottom-right-radius: 8px;
+          &:before,
+          &::after {
+            content: '';
+            position: absolute;
+            width: 8px;
+            height: 8px;
+            background-color: #f5f5f5;
+          }
+          &:before {
+            border-radius: 0 8px 0 0;
+            top: -1px;
+            left: -9px;
+            box-shadow: 4px 0 0 0 #ffffff;
+          }
+          &::after {
+            border-radius: 8px 0 0 0;
+            top: -1px;
+            right: -9px;
+            box-shadow: -4px 0 0 0 #ffffff;
+          }
+        }
       }
     }
   }
@@ -383,10 +421,6 @@
       height: auto;
     }
 
-    .es-tabs__nav-main.is-left,
-    .es-tabs__nav-main.is-right {
-      margin-bottom: 0;
-    }
     .es-tabs__nav-wrap.is-left,
     .es-tabs__nav-wrap.is-right {
       margin-bottom: 0;
@@ -440,9 +474,6 @@
       margin-right: 10px;
       flex-direction: column;
     }
-    .es-tabs__nav-main.is-left {
-      margin-right: -1px;
-    }
     .es-tabs__nav-wrap.is-left {
       &::after {
         left: auto;
@@ -512,6 +543,9 @@
         }
       }
     }
+    .es-tabs__content{
+      height: 100%;
+    }
   }
   @include m(right) {
     .es-tabs__header.is-right {
@@ -521,9 +555,6 @@
       flex-direction: column;
     }
 
-    .es-tabs__nav-main.is-right {
-      margin-left: -1px;
-    }
     .es-tabs__nav-wrap.is-right {
       &::after {
         left: 0;

package/src/config/api.js

@@ -318,3 +318,16 @@ export const toFreeTaskCircularRead = '/bpm/bpmBackend/toFreeTaskCircularRead';
 export const freeTaskCircularRead =
   '/bpm/bpmBackend/freeTaskCircularRead';
 
+/** 自定义配置 */
+// 获取自定义配置列表
+export const pageLists = '/main2/pageComponentConfig/listJson';
+// 获取已发布自定义配置列表
+export const publishedLists = '/main2/pageComponentConfig/listPublished';
+// 获取自定义配置详情
+export const pageInfo = '/main2/pageComponentConfig/info';
+// 保存自定义配置,发布也调这个接口但要加上字段status=1
+export const pageSave = '/main2/pageComponentConfig/save';
+// 更新自定义配置
+export const pageUpdate = '/main2/pageComponentConfig/update';
+// 删除自定义配置
+export const pageDelete = '/main2/pageComponentConfig/deleteById';

package/src/index.js

@@ -36,6 +36,7 @@ import Dropdown from '../packages/dropdown/index.js';
 import DropdownItem from '../packages/dropdown-item/index.js';
 import DropdownMenu from '../packages/dropdown-menu/index.js';
 import EmailLogin from '../packages/email-login/index.js';
+import Empty from '../packages/empty/index.js';
 import Flip from '../packages/flip/index.js';
 import Flow from '../packages/flow/index.js';
 import FlowGroup from '../packages/flow-group/index.js';
@@ -53,6 +54,7 @@ import Input from '../packages/input/index.js';
 import Link from '../packages/link/index.js';
 import Loading from '../packages/loading/index.js';
 import Login from '../packages/login/index.js';
+import Lowcode from '../packages/lowcode/index.js';
 import Main from '../packages/main/index.js';
 import Marquee from '../packages/marquee/index.js';
 import MenuItem from '../packages/menu-item/index.js';
@@ -139,6 +141,7 @@ const components = [
   DropdownItem,
   DropdownMenu,
   EmailLogin,
+  Empty,
   Flip,
   Flow,
   FlowGroup,
@@ -154,6 +157,7 @@ const components = [
   Input,
   Link,
   Login,
+  Lowcode,
   Main,
   Marquee,
   MenuItem,
@@ -202,7 +206,7 @@ const components = [
   CollapseTransition
 ];
 
-const install = function(Vue) {
+const install = function(Vue, opts = {}) {
 
   components.forEach(component => {
     Vue.component(component.name, component);
@@ -212,8 +216,15 @@ const install = function(Vue) {
   Vue.use(Loading.directive);
 
   Vue.prototype.$EOSS = {
-    size: '',
-    zIndex: 2000
+    size: opts.size || '',
+    zIndex: opts.zIndex || 2000,
+    qrCodeSize: opts.qrCodeSize || {
+      large: 284,
+      default: 250,
+      medium: 218,
+      small: 190,
+      mini: 174
+    }
   };
 
   Vue.prototype.$loading = Loading.service;
@@ -231,7 +242,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.1.0-alpha.20',
+  version: '0.1.0-alpha.21',
   install,
   CollapseTransition,
   Loading,
@@ -271,6 +282,7 @@ export default {
   DropdownItem,
   DropdownMenu,
   EmailLogin,
+  Empty,
   Flip,
   Flow,
   FlowGroup,
@@ -287,6 +299,7 @@ export default {
   Input,
   Link,
   Login,
+  Lowcode,
   Main,
   Marquee,
   MenuItem,

package/src/utils/ajax.js

@@ -21,8 +21,6 @@ const statusMap = {
   503: '服务不可用（503）'
 };
 
-// 全局实例和状态
-let $_http;
 // let loginMsg;
 let initAuth;
 
@@ -117,76 +115,74 @@ export const ajax = function ({
   }
 
   // 初始化axios实例
-  if (!$_http) {
-    const baseURL = host === true ? getStorage('host') : host === false ? '' : host;
-    $_http = axios.create({
-      baseURL,
-      timeout: 99000,
-      transformResponse: [
-        function (responseData) {
-          try {
-            return JSONbigToString.parse(responseData);
-          } catch (err) {
-            return responseData;
-          }
+  const baseURL = host === true ? getStorage('host') : host === false ? '' : host;
+  const $_http = axios.create({
+    baseURL,
+    timeout: 99000,
+    transformResponse: [
+      function (responseData) {
+        try {
+          return JSONbigToString.parse(responseData);
+        } catch (err) {
+          return responseData;
         }
-      ]
-    });
+      }
+    ]
+  });
 
     // 请求拦截器
-    $_http.interceptors.request.use(
-      (config) => {
-        config.headers.common = getStorage();
-        return config;
-      },
-      (err) => Promise.reject(err)
-    );
-
-    // 响应拦截器
-    $_http.interceptors.response.use(
-      (response) => {
-
-        // 处理认证信息
-        if (response.headers.authorization) {
-          const currentToken = getStorage('token');
-          if (response.headers.authorization !== currentToken) {
-            setStorage({
-              key: ['token', 'Authorization'],
-              value: response.headers.authorization
-            });
-          }
+  $_http.interceptors.request.use(
+    (config) => {
+      config.headers.common = getStorage();
+      return config;
+    },
+    (err) => Promise.reject(err)
+  );
+
+  // 响应拦截器
+  $_http.interceptors.response.use(
+    (response) => {
+
+      // 处理认证信息
+      if (response.headers.authorization) {
+        const currentToken = getStorage('token');
+        if (response.headers.authorization !== currentToken) {
+          setStorage({
+            key: ['token', 'Authorization'],
+            value: response.headers.authorization
+          });
         }
+      }
 
-        // 处理会话ID
-        const ssId = response.headers.ssId || response.headers.Ssid || response.headers.ssid;
-        if (ssId) {
-          const currentSsId = getStorage('ssId');
-          if (ssId !== currentSsId) {
-            setStorage({ key: 'ssId', value: ssId });
-          }
+      // 处理会话ID
+      const ssId = response.headers.ssId || response.headers.Ssid || response.headers.ssid;
+      if (ssId) {
+        const currentSsId = getStorage('ssId');
+        if (ssId !== currentSsId) {
+          setStorage({ key: 'ssId', value: ssId });
         }
+      }
 
-        // 处理响应数据
-        if (response.status === 200) {
-          responses(response.data);
-          return Promise.resolve(JSON.parse(JSON.stringify(response.data)));
-        }
-        return response;
-      },
-      (error) => {
-
-        // 处理错误信息
-        if (error && error.response) {
-          if (error.response.status) {
-            error.message = statusMap[error.response.status] || `连接错误${error.response.status}`;
-          } else {
-            error.message = '无法请求,请联系管理员';
-          }
+      // 处理响应数据
+      if (response.status === 200) {
+        responses(response.data);
+        return Promise.resolve(JSON.parse(JSON.stringify(response.data)));
+      }
+      return response;
+    },
+    (error) => {
+
+      // 处理错误信息
+      if (error && error.response) {
+        if (error.response.status) {
+          error.message = statusMap[error.response.status] || `连接错误${error.response.status}`;
+        } else {
+          error.message = '无法请求,请联系管理员';
         }
-        return Promise.reject(error);
       }
-    );
-  }
+      return Promise.reject(error);
+    }
+  );
 
   // 添加默认用户ID
   const userId = getStorage('userId');
@@ -588,7 +584,7 @@ function redirectToLogin() {
  * @param {sting} [loginPage] - 第三方登录页面地址
  * @param {boolean} [redirect] - 是否重定向（用于新脚手架）
  **/
-export const isLogined = async function ({
+export const isLogined = function ({
   to,
   _from, // eslint-disable-line no-unused-vars
   next,
@@ -642,7 +638,7 @@ export const isLogined = async function ({
       const loadingInstance = loading('页面加载中...');
 
       try {
-        const res = await ajax({
+        const res = ajax({
           method: 'post',
           url: authCenter,
           data: to.query

package/src/utils/bus.js

@@ -8,12 +8,12 @@ import Vue from 'vue';
  *
  * @example
  * A组件：
- *  import bus from '$ui/utils/bus'
+ *  import bus from 'eoss/src/utils/bus.js'
  *  // 触发事件
  *  bus.$emit('message', data)
  *
  *  B组件：
- *  import bus from '$ui/util/bus'
+ *  import bus from 'eoss/src/utils/bus.js'
  *
  *  // 侦听事件
  *  bus.$on('message', data => {

package/src/utils/popup/index.js

@@ -41,6 +41,10 @@ export default {
     closeOnClickModal: {
       type: Boolean,
       default: false
+    },
+    lazy: {
+      type: Boolean,
+      default: true
     }
   },
 
@@ -71,7 +75,7 @@ export default {
       bodyPaddingRight: null,
       computedBodyPaddingRight: 0,
       withoutHiddenClass: true,
-      rendered: false
+      rendered: !this.lazy
     };
   },
 

package/src/utils/util.js

@@ -1175,7 +1175,8 @@ export const getObjectType = function (obj) {
  * @param {String} [options.name] - 参数名，可选
  * @return {Object|string} 参数对象或指定参数值
  **/
-export const getParams = function ({url, name} = {}) {
+export const getParams = function (options = {}) {
+  const { url, name } = typeof options === 'string' ? {name: options} : options;
   let href = '';
   try {
     href = window.top.location.href;
@@ -1579,10 +1580,7 @@ export const indexOfObj = function (arry, target, key) {
           return i;
         }
       } else if (target && typeof target === 'object') {
-        if (currentItem[currentKey] === undefined) {
-          throw new Error(`属性${currentKey}不存在`);
-        }
-        if (currentItem[currentKey] === target[currentKey]) {
+        if (currentItem[currentKey] !== undefined && currentItem[currentKey] === target[currentKey]) {
           return i;
         }
       }
@@ -1757,7 +1755,106 @@ export const joinUrl = function ({ url, reg }) {
   // 如果前缀类型无效，直接返回URL
   return url;
 };
+/**
+ * layoutWaterfall
+ * @desc 布布流布局计算
+ * @author huangbo
+ * @date 2022年5月7日
+ * @param {String} url - JS文件地址
+ * @param {Function} [callback] - 回调函数
+ **/
+export const layoutWaterfall = function (self, container, pages, columns, gap) {
+  if (!container) return;
+
+  if (pages.length === 0) return;
+
+  // 获取容器实际内容宽度（减去 padding）
+  const computedStyle = getComputedStyle(container);
+  const paddingLeft = parseFloat(computedStyle.paddingLeft) || 0;
+  const paddingRight = parseFloat(computedStyle.paddingRight) || 0;
+  const paddingTop = parseFloat(computedStyle.paddingTop) || 0;
+  const containerWidth = container.clientWidth - paddingLeft - paddingRight;
+  if (containerWidth === 0) return;
+
+  // 计算每列宽度
+  const columnWidth =
+				(containerWidth - gap * (columns - 1)) / columns;
+
+  // 初始化每列高度数组（以 paddingTop 为起始偏移）
+  const columnHeights = new Array(columns).fill(paddingTop);
+
+  // 遍历所有元素，分配到高度最小的列
+  pages.forEach(item => {
+    // 确保span在有效范围内
+    const span = Math.max(1, Math.min(item.style ? item.style.span || item.span || 1 : item.span || 1, columns));
+
+    // 找到可以容纳当前元素span宽度的最小高度起始列
+    let minHeight = Infinity;
+    let startColumn = 0;
+
+    // 遍历所有可能的起始列，找到可以放置span列元素的位置
+    for (let i = 0; i <= columns - span; i++) {
+      // 计算当前连续span列的最大高度
+      let currentMaxHeight = 0;
+      for (let j = i; j < i + span; j++) {
+        if (columnHeights[j] > currentMaxHeight) {
+          currentMaxHeight = columnHeights[j];
+        }
+      }
+
+      // 找到最小的最大高度
+      if (currentMaxHeight < minHeight) {
+        minHeight = currentMaxHeight;
+        startColumn = i;
+      }
+    }
+
+    // 计算元素宽度和位置
+    const existingWidth = (item.style && item.style.width) ? parseInt(item.style.width, 10) : null;
+    const hasSpan = (item.style && item.style.span) || item.span;
+    const calculatedWidth = columnWidth * span + gap * (span - 1);
+    const useCustomWidth = !hasSpan && existingWidth;
+    const elementWidth = useCustomWidth ? existingWidth : calculatedWidth;
+
+    // 根据是否使用自定义宽度计算 left（加上 padding 偏移）
+    let left;
+    if (useCustomWidth) {
+      // 自定义宽度：在分配的列范围内居中（取整避免亚像素）
+      const columnSpaceWidth = columnWidth * span + gap * (span - 1);
+      left = Math.round(paddingLeft + startColumn * columnWidth + startColumn * gap + (columnSpaceWidth - elementWidth) / 2);
+    } else {
+      // 标准 span 宽度：正常计算位置
+      left = paddingLeft + startColumn * columnWidth + startColumn * gap;
+    }
+    const top = minHeight;
 
+    // 设置元素样式（使用Vue的$set确保响应式）
+    if (!item.style) {
+      self.$set(item, 'style', {});
+    }
+    const height = item.style.height ? parseInt(item.style.height, 10) : 30 ;
+    self.$set(item.style, 'position', 'absolute');
+    self.$set(item.style, 'width', `${elementWidth}px`);
+    self.$set(item.style, 'height', `${height}px`);
+    self.$set(item.style, 'left', `${left}px`);
+    self.$set(item.style, 'top', `${top}px`);
+    if (!useCustomWidth) {
+      self.$set(item.style, 'span', span);
+    }
+
+    // 更新所有被占用列的高度
+    const newHeight = top + height + gap;
+    for (let i = startColumn; i < startColumn + span; i++) {
+      columnHeights[i] = newHeight;
+    }
+  });
+
+  // 设置容器高度
+  let maxHeight = Math.max(...columnHeights);
+  container.style.position = 'relative';
+  container.style.height = `${maxHeight - gap}px`; // 减去最后一个间隙
+  return {columnWidth, width: containerWidth};
+};
 /**
  * loadJs
  * @desc 加载JS文件
@@ -1897,8 +1994,8 @@ export const receiveMessage = function (callback) {
  **/
 export const renderIcon = function (data, node, icons) {
   const { attributes } = data || {};
-  const orgType = attributes.orgType || data.orgType;
-  const layerlevel = attributes.layerlevel || data.layerlevel;
+  const orgType = attributes ? attributes.orgType : data.orgType;
+  const layerlevel = attributes ? attributes.layerlevel : data.layerlevel;
   if (!orgType) return '';
   let key = orgType === 'org' ? layerlevel ? 'bumen' : 'gongsi' : 'bumen';
   if (node.level === 1 && (data.subNode || data.isParent || data.hasChildren)) {