eoss 0.1.0-alpha.5 → 0.1.0-alpha.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss",
-  "version": "0.1.0-alpha.5",
+  "version": "0.1.0-alpha.7",
   "description": "eoss内部组件库",
   "main": "lib/eoss.common.js",
   "files": [

package/packages/autocomplete/src/autocomplete.vue

@@ -207,7 +207,7 @@ export default {
             this.highlightedIndex = this.highlightFirstItem ? 0 : -1;
           } else {
             console.error(
-              '[Element Error][Autocomplete]autocomplete suggestions must be an array'
+              '[Error][Autocomplete]autocomplete suggestions must be an array'
             );
           }
         },

package/packages/carousel/src/item.vue

@@ -93,7 +93,7 @@ export default {
       if (parentType === 'card') {
         if (parentDirection === 'vertical') {
           console.warn(
-            '[Element Warn][Carousel]vertical direction is not supported in card mode'
+            '[Warn][Carousel]vertical direction is not supported in card mode'
           );
         }
         this.inStage = Math.round(Math.abs(index - activeIndex)) <= 1;

package/packages/carousel/src/main.vue

@@ -252,7 +252,7 @@ export default {
       }
       index = Number(index);
       if (isNaN(index) || index !== Math.floor(index)) {
-        console.warn('[Element Warn][Carousel]index must be an integer.');
+        console.warn('[Warn][Carousel]index must be an integer.');
         return;
       }
       let length = this.items.length;

package/packages/cascader/src/cascader.vue

@@ -262,7 +262,7 @@ export default {
   computed: {
     realSize() {
       const _esFormItemSize = (this.esFormItem || {}).esFormItemSize;
-      return this.size || _esFormItemSize || (this.$ELEMENT || {}).size;
+      return this.size || _esFormItemSize || (this.$EOSS || {}).size;
     },
     tagSize() {
       return ['small', 'mini'].indexOf(this.realSize) > -1 ? 'mini' : 'small';

package/packages/checkbox/src/checkbox-group.vue

@@ -131,7 +131,7 @@ export default {
       return (this.esFormItem || {}).esFormItemSize;
     },
     checkboxGroupSize() {
-      return this.size || this._esFormItemSize || (this.$ELEMENT || {}).size;
+      return this.size || this._esFormItemSize || (this.$EOSS || {}).size;
     }
   },
 

package/packages/checkbox/src/checkbox.vue

@@ -51,10 +51,7 @@
       />
     </span>
     <template v-if="$slots.default || label">
-      <es-tooltip
-        v-if="showTooltip"
-        v-bind="getTooltipProps()"
-      >
+      <es-tooltip v-if="showTooltip" v-bind="getTooltipProps()">
         <span class="es-checkbox__label">
           <slot>
             {{
@@ -299,7 +296,7 @@ export default {
 
     checkboxSize() {
       const temCheckboxSize =
-        this.size || this._esFormItemSize || (this.$ELEMENT || {}).size;
+        this.size || this._esFormItemSize || (this.$EOSS || {}).size;
       return this.isGroup
         ? this._checkboxGroup.checkboxGroupSize || temCheckboxSize
         : temCheckboxSize;
@@ -320,31 +317,34 @@ export default {
   },
 
   methods: {
-      // 获取缓存的tooltip props对象
-      getTooltipProps() {
-        if (!this.showTooltip) {
-          return null;
-        }
-        
-        const newProps = {
-          effect: this.effect,
-          content: this.tooltip,
-          placement: this.placement,
-          ...this.tooltipConfig
+    // 获取缓存的tooltip props对象
+    getTooltipProps() {
+      if (!this.showTooltip) {
+        return null;
+      }
+
+      const newProps = {
+        effect: this.effect,
+        content: this.tooltip,
+        placement: this.placement,
+        ...this.tooltipConfig
+      };
+
+      const newPropsKey = JSON.stringify(newProps);
+
+      // 如果缓存不存在或props发生变化，更新缓存
+      if (
+        !this._tooltipPropsCache ||
+        this._tooltipPropsCache.key !== newPropsKey
+      ) {
+        this._tooltipPropsCache = {
+          key: newPropsKey,
+          props: newProps
         };
-        
-        const newPropsKey = JSON.stringify(newProps);
-        
-        // 如果缓存不存在或props发生变化，更新缓存
-        if (!this._tooltipPropsCache || this._tooltipPropsCache.key !== newPropsKey) {
-          this._tooltipPropsCache = {
-            key: newPropsKey,
-            props: newProps
-          };
-        }
-        
-        return this._tooltipPropsCache.props;
-      },
+      }
+
+      return this._tooltipPropsCache.props;
+    },
     addToStore() {
       if (
         {}.toString.call(this.label) === '[object Object]' &&

package/packages/flow-group/src/main.vue

@@ -604,12 +604,12 @@ export default {
           };
         }
       }
-      let param = extend(
+      let params = extend(
         {},
         { id: this.businessId, appId: this.taskExamineAppId },
         res.param || {}
       );
-      return urlJoinParams({ url, param });
+      return urlJoinParams({ url, params });
     },
     handleBefore(active, old) {
       return new Promise((resolve, reject) => {

package/packages/form/src/form.vue

@@ -727,7 +727,7 @@ export default {
         // 优化模型检查和错误提示
         if (!this.model) {
           console.warn(
-            '[Element Warn][Form]model is required for resetFields to work.'
+            '[Warn][Form]model is required for resetFields to work.'
           );
           return;
         }
@@ -763,9 +763,7 @@ export default {
     validate(callback) {
       // 优化模型检查
       if (!this.model && !this.value) {
-        console.warn(
-          '[Element Warn][Form]model is required for validate to work!'
-        );
+        console.warn('[Warn][Form]model is required for validate to work!');
         return Promise.resolve ? Promise.resolve() : undefined;
       }
 
@@ -827,7 +825,7 @@ export default {
       const fields = this.fields.filter((field) => propMap.has(field.prop));
 
       if (!fields.length) {
-        console.warn('[Element Warn]please pass correct props!');
+        console.warn('[Warn]please pass correct props!');
         return;
       }
 

package/packages/input/src/input.vue

@@ -242,7 +242,7 @@ export default {
       validator() {
         process.env.NODE_ENV !== 'production' &&
           console.warn(
-            "[Element Warn][Input]'auto-complete' property will be deprecated in next major version. please use 'autocomplete' instead."
+            "[Warn][Input]'auto-complete' property will be deprecated in next major version. please use 'autocomplete' instead."
           );
         return true;
       }
@@ -305,7 +305,7 @@ export default {
       return merge({}, this.textareaCalcStyle, { resize: this.resize });
     },
     inputSize() {
-      return this.size || this._esFormItemSize || (this.$ELEMENT || {}).size;
+      return this.size || this._esFormItemSize || (this.$EOSS || {}).size;
     },
     inputDisabled() {
       return this.disabled || (this.esForm || {}).disabled;

package/packages/input-number/src/input-number.vue

@@ -162,7 +162,7 @@ export default {
       if (precision !== undefined) {
         if (stepPrecision > precision) {
           console.warn(
-            '[Element Warn][InputNumber]precision should not be less than the decimal places of step'
+            '[Warn][InputNumber]precision should not be less than the decimal places of step'
           );
         }
         return precision;
@@ -177,7 +177,7 @@ export default {
       return (this.esFormItem || {}).esFormItemSize;
     },
     inputNumberSize() {
-      return this.size || this._esFormItemSize || (this.$ELEMENT || {}).size;
+      return this.size || this._esFormItemSize || (this.$EOSS || {}).size;
     },
     inputNumberDisabled() {
       return this.disabled || !!(this.esForm || {}).disabled;

package/packages/login/src/login.vue

@@ -521,10 +521,10 @@ export default {
             () => {
               this.operationCheckCode = results.checkCode;
               if (this.changePasswordUrl || this.forgetUrl) {
-                const url = urlJoinParams(
-                  this.changePasswordUrl || this.forgetUrl,
-                  { checkCode: results.checkCode }
-                );
+                const url = urlJoinParams({
+                  url: this.changePasswordUrl || this.forgetUrl,
+                  params: { checkCode: results.checkCode }
+                });
                 window.open(url);
               } else {
                 this.showResetPassword = true;

package/packages/main/src/main.vue

@@ -525,6 +525,7 @@ export default {
       type: String,
       default: 'es-icon-application'
     },
+    menuData: Array,
     //默认主题颜色
     theme: {
       type: String,
@@ -750,8 +751,7 @@ export default {
       return { ...hides, ...this.hides, ...handleHides };
     },
     menuApps() {
-      console.log(this.userApps, this.menus);
-      return this.userApps.length ? this.userApps : this.menus;
+      return this.userApps.length ? this.userApps : this.menuData || this.menus;
     }
   },
   watch: {
@@ -796,7 +796,7 @@ export default {
       //点击应用存侧边
       newApps: [],
       //所有菜单
-      menus: [],
+      menus: this.menuData,
       //菜单名称
       title: '',
       //子菜单
@@ -2314,15 +2314,16 @@ export default {
      * @date 2024年9月7日
      **/
     handlerClickMenu(res) {
-      ajax({
-        url: recordUserApp,
-        params: {
-          userId: this.user.userId,
-          appId: res.id
-        }
-      })
-        .then(() => {})
-        .catch(() => {});
+      this.remote &&
+        ajax({
+          url: recordUserApp,
+          params: {
+            userId: this.user.userId,
+            appId: res.id
+          }
+        })
+          .then(() => {})
+          .catch(() => {});
       this.showMsg = false;
       this.showSet = false;
 

package/packages/popover/src/main.vue

@@ -140,7 +140,7 @@ export default {
     } else if (this.trigger === 'focus') {
       if (this.tabindex < 0) {
         console.warn(
-          '[Element Warn][Popover]a negative taindex means that the element cannot be focused by tab key'
+          '[Warn][Popover]a negative taindex means that the element cannot be focused by tab key'
         );
       }
       if (reference.querySelector('input, textarea')) {

package/packages/radio/src/radio-group.vue

@@ -115,7 +115,7 @@ export default {
       return (this.esFormItem || {}).esFormItemSize;
     },
     radioGroupSize() {
-      return this.size || this._esFormItemSize || (this.$ELEMENT || {}).size;
+      return this.size || this._esFormItemSize || (this.$EOSS || {}).size;
     }
   },
   watch: {

package/packages/radio/src/radio.vue

@@ -231,7 +231,7 @@ export default {
     },
     radioSize() {
       const temRadioSize =
-        this.size || this._esFormItemSize || (this.$ELEMENT || {}).size;
+        this.size || this._esFormItemSize || (this.$EOSS || {}).size;
       return this.isGroup
         ? this._radioGroup.radioGroupSize || temRadioSize
         : temRadioSize;

package/packages/select/src/select.vue

@@ -520,7 +520,7 @@ export default {
     },
 
     selectSize() {
-      return this.size || this._esFormItemSize || (this.$ELEMENT || {}).size;
+      return this.size || this._esFormItemSize || (this.$EOSS || {}).size;
     },
 
     selectDisabled() {

package/packages/slider/src/slider.vue

@@ -228,9 +228,7 @@ export default {
     },
     setValues() {
       if (this.min > this.max) {
-        console.error(
-          '[Element Error][Slider]min should not be greater than max.'
-        );
+        console.error('[Error][Slider]min should not be greater than max.');
         return;
       }
       const val = this.value;
@@ -333,7 +331,7 @@ export default {
       if (!this.showStops || this.min > this.max) return [];
       if (this.step === 0) {
         process.env.NODE_ENV !== 'production' &&
-          console.warn('[Element Warn][Slider]step should not be 0.');
+          console.warn('[Warn][Slider]step should not be 0.');
         return [];
       }
       const stopCount = (this.max - this.min) / this.step;

package/packages/table/src/layout-observer.js

@@ -13,7 +13,7 @@ export default {
     try {
       this.tableLayout.addObserver(this);
     } catch (error) {
-      console.error('[Element Error] Failed to add observer to table layout:', error);
+      console.error('[Error] Failed to add observer to table layout:', error);
     }
   },
 
@@ -24,7 +24,7 @@ export default {
     try {
       this.tableLayout.removeObserver(this);
     } catch (error) {
-      console.error('[Element Error] Failed to remove observer from table layout:', error);
+      console.error('[Error] Failed to remove observer from table layout:', error);
     }
   },
 
@@ -82,7 +82,7 @@ export default {
         this.onColumnsChange(this.tableLayout);
         this.onScrollableChange(this.tableLayout);
       } catch (error) {
-        console.error('[Element Error] Failed to initialize layout:', error);
+        console.error('[Error] Failed to initialize layout:', error);
       }
     },
 
@@ -110,7 +110,7 @@ export default {
         // 更新每列的宽度
         this._updateColumnWidths(cols, columnsMap);
       } catch (error) {
-        console.error('[Element Error] Failed to handle columns change:', error);
+        console.error('[Error] Failed to handle columns change:', error);
       }
     },
 
@@ -131,7 +131,7 @@ export default {
         // 更新gutter表头单元格样式
         this._updateGutterHeaderCells(layout);
       } catch (error) {
-        console.error('[Element Error] Failed to handle scrollable change:', error);
+        console.error('[Error] Failed to handle scrollable change:', error);
       }
     },
 

package/packages/table/src/table copy.vue

@@ -900,7 +900,7 @@ export default {
 
   computed: {
     tableSize() {
-      return this.size || (this.$ELEMENT || {}).size;
+      return this.size || (this.$EOSS || {}).size;
     },
 
     bodyWrapper() {

package/packages/table/src/table-body.js

@@ -164,7 +164,7 @@ export default {
             filter: '.drag-sort-disabled'
           });
         } catch (error) {
-          console.error('[Element Error] Failed to initialize sortable:', error);
+          console.error('[Error] Failed to initialize sortable:', error);
         }
       });
     },
@@ -239,7 +239,7 @@ export default {
             colspan = result.colspan;
           }
         } catch (error) {
-          console.error('[Element Error] spanMethod execution failed:', error);
+          console.error('[Error] spanMethod execution failed:', error);
         }
       }
 
@@ -262,7 +262,7 @@ export default {
             rowIndex
           });
         } catch (error) {
-          console.error('[Element Error] rowStyle function execution failed:', error);
+          console.error('[Error] rowStyle function execution failed:', error);
           return null;
         }
       }
@@ -324,7 +324,7 @@ export default {
             classes.push(customClass);
           }
         } catch (error) {
-          console.error('[Element Error] rowClassName function execution failed:', error);
+          console.error('[Error] rowClassName function execution failed:', error);
         }
       }
 
@@ -356,7 +356,7 @@ export default {
             column
           });
         } catch (error) {
-          console.error('[Element Error] cellStyle function execution failed:', error);
+          console.error('[Error] cellStyle function execution failed:', error);
           return null;
         }
       }
@@ -395,7 +395,7 @@ export default {
             classes.push(customClass);
           }
         } catch (error) {
-          console.error('[Element Error] cellClassName function execution failed:', error);
+          console.error('[Error] cellClassName function execution failed:', error);
         }
       }
 
@@ -504,7 +504,7 @@ export default {
           this.activateTooltip(tooltip);
         }
       } catch (error) {
-        console.error('[Element Error] Tooltip display handling failed:', error);
+        console.error('[Error] Tooltip display handling failed:', error);
       }
     },
 
@@ -592,7 +592,7 @@ export default {
         // 触发行事件
         table.$emit(`row-${name}`, row, column || null, event);
       } catch (error) {
-        console.error(`[Element Error] Failed to handle ${name} event:`, error);
+        console.error(`[Error] Failed to handle ${name} event:`, error);
       }
     },
 
@@ -691,7 +691,7 @@ export default {
       const tr = this.rowRender(row, $index);
 
       if (!renderExpanded) {
-        console.error('[Element Error]renderExpanded is required.');
+        console.error('[Error]renderExpanded is required.');
         return tr;
       }
 
@@ -743,7 +743,7 @@ export default {
 
         return tmp;
       } catch (error) {
-        console.error('[Element Error] Failed to render tree rows:', error);
+        console.error('[Error] Failed to render tree rows:', error);
         return [this.rowRender(row, $index)];
       }
     },
@@ -847,7 +847,7 @@ export default {
         this.newData = data;
         this.table.updateDragSort(data, evt);
       } catch (error) {
-        console.error('[Element Error] Failed to handle drag sort update:', error);
+        console.error('[Error] Failed to handle drag sort update:', error);
       }
     },
 

package/packages/table/src/table-column.js

@@ -212,7 +212,7 @@ export default {
     _setHeaderRender(column) {
       // renderHeader 属性不推荐使用
       if (this.renderHeader) {
-        console.warn('[Element Warn][TableColumn]Comparing to render-header, scoped-slot header is easier to use. We recommend users to use scoped-slot header.');
+        console.warn('[Warn][TableColumn]Comparing to render-header, scoped-slot header is easier to use. We recommend users to use scoped-slot header.');
       } else if (column.type !== 'selection') {
         column.renderHeader = (h, scope) => {
           const renderHeader = this.$scopedSlots.header;

package/packages/theme-chalk/package.json

@@ -1,7 +1,7 @@
 {
-  "name": "element-theme-chalk",
+  "name": "eoss-theme-chalk",
   "version": "2.14.1",
-  "description": "Element component chalk theme.",
+  "description": "Eoss component chalk theme.",
   "main": "lib/index.css",
   "style": "lib/index.css",
   "files": [
@@ -13,18 +13,18 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ElementUI/theme-chalk.git"
+    "url": "git+https://github.com/EossUI/theme-chalk.git"
   },
   "keywords": [
-    "element",
+    "eoss",
     "theme"
   ],
   "author": "yi.shyang@ele.me",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/ElementUI/theme-chalk/issues"
+    "url": "https://github.com/EossUI/theme-chalk/issues"
   },
-  "homepage": "https://github.com/ElementUI/theme-chalk#readme",
+  "homepage": "https://github.com/EossUI/theme-chalk#readme",
   "devDependencies": {
     "gulp": "^3.9.1",
     "gulp-cssmin": "^0.1.7",

package/packages/theme-chalk/src/common/var.scss

@@ -1,7 +1,7 @@
 @use 'sass:list';
 @use '../mixins/color.scss' as *;
 
-/* Element Chalk Variables */
+/* Eoss Chalk Variables */
 
 /* Transition
 -------------------------- */
@@ -315,7 +315,7 @@ $fill-base: $color-white !default;
 
 /* Typography
 -------------------------- */
-$font-path: '~eoss/lib/theme-chalk/fonts' !default;
+$font-path: 'fonts' !default;
 $font-display: 'auto' !default;
 // 字体大小
 /// display1 报告标题、关键数据展示

package/packages/theme-chalk/src/mixins/function.scss

@@ -2,6 +2,26 @@
 @use 'sass:color';
 @use 'sass:string';
 
+/* Helper function to trim whitespace from string
+ -------------------------- */
+@function trim($string) {
+  $length: string.length($string);
+  $start: 1;
+  $end: $length;
+
+  // 找到第一个非空格字符
+  @while $start <= $length and string.slice($string, $start, $start) == ' ' {
+    $start: $start + 1;
+  }
+
+  // 找到最后一个非空格字符
+  @while $end >= $start and string.slice($string, $end, $end) == ' ' {
+    $end: $end - 1;
+  }
+
+  @return string.slice($string, $start, $end);
+}
+
 /* BEM support Func
  -------------------------- */
 @function selectorToString($selector) {
@@ -55,7 +75,7 @@
     @if $start and $end {
       $default-color: string.slice($color, $start, $end);
       // 去除前后空格
-      $default-color: string.unquote(string.trim($default-color));
+      $default-color: string.unquote(trim($default-color));
       @return $default-color;
     }
   }

package/packages/upload/src/index.vue

@@ -506,7 +506,7 @@ export default {
             try {
               file.url = URL.createObjectURL(file.raw);
             } catch (err) {
-              console.error('[Element Error][Upload]', err);
+              console.error('[Error][Upload]', err);
             }
           }
           return file;
@@ -650,7 +650,7 @@ export default {
         try {
           file.url = URL.createObjectURL(rawFile);
         } catch (err) {
-          console.error('[Element Error][Upload]', err);
+          console.error('[Error][Upload]', err);
           return;
         }
       }

package/src/index.js

@@ -203,7 +203,7 @@ const install = function(Vue) {
   Vue.use(InfiniteScroll);
   Vue.use(Loading.directive);
 
-  Vue.prototype.$ELEMENT = {
+  Vue.prototype.$EOSS = {
     size: '',
     zIndex: 2000
   };
@@ -223,7 +223,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.1.0-alpha.5',
+  version: '0.1.0-alpha.7',
   install,
   CollapseTransition,
   Loading,

package/src/utils/ajax.js

@@ -645,20 +645,6 @@ export const isLogined = async function ({
     cookie = getParams({ name: 'cookie' });
   }
 
-  // 处理退出登录
-  const quit = getParams('quit') || getParams('logout');
-  if (quit) {
-    try {
-      const res = await ajax({ method: 'post', url: logout });
-      if (res.rCode === 0) {
-        removeStorage();
-      }
-    } catch (error) {
-      console.error('退出登录失败:', error);
-    }
-    return;
-  }
-
   // 处理登录页面路径
   let pathname = '';
   try {