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

package/packages/main/src/gzw.vue

@@ -14,43 +14,6 @@
       @open="handleOpen"
     ></application>
     <div class="es-main__content is-gzw" ref="content">
-      <!-- AI/IM -->
-      <es-drawer
-        class="es-simplicity-public-drawer"
-        :direction="drawer.direction"
-        modal-class="es-simplicity-apps-modal"
-        size="100%"
-        show-close
-        :modal-append-to-body="false"
-        :visible.sync="drawer.visible"
-      >
-        <div
-          class="es-public-drawer-main"
-          v-if="drawer.ai && drawer.ai.url"
-          v-show="drawer.active == 'ai'"
-        >
-          <iframe
-            frameborder="0"
-            width="100%"
-            height="100%"
-            :src="drawer.ai.url"
-          ></iframe>
-        </div>
-        <div
-          class="es-public-drawer-main"
-          v-if="drawer.im && drawer.im.url"
-          v-show="drawer.active == 'im'"
-        >
-          <iframe
-            frameborder="0"
-            width="100%"
-            height="100%"
-            :src="drawer.im.url"
-          ></iframe>
-        </div>
-      </es-drawer>
-      <!-- AI/IM end -->
-
       <!-- 路由、iframe -->
       <pages
         :isFourthTabs="isFourthTabs"
@@ -100,18 +63,12 @@
       <div
         v-if="showAi"
         class="es-main__ai"
-        :class="{ 'is-float': aiFloat, 'is-full': aiFull }"
         :style="aiStyle"
         @click.stop="handleClickAi"
         @pointerdown="startDrag"
       >
-        <img
-          v-show="aiFloat"
-          class="es-main__ai--logo"
-          :src="aiLogoUrl"
-          ref="aiLogo"
-        />
-        <div
+        <img class="es-main__ai--logo" :src="aiLogoUrl" ref="aiLogo" />
+        <!-- <div
           class="es-main__ai--content"
           :class="{ 'is-open': aiOpen }"
           v-show="!aiFloat"
@@ -122,7 +79,7 @@
             height="100%"
             :src="(aiConfig || {}).url || ''"
           ></iframe>
-        </div>
+        </div> -->
       </div>
       <!-- 路由、iframe end -->
 
@@ -177,6 +134,44 @@
       </es-dialog>
       <!-- 公用弹窗 end -->
     </div>
+    <!-- AI/IM -->
+    <es-drawer
+      class="es-simplicity-public-drawer is-gzw"
+      :direction="drawer.direction"
+      modal-class="is-gzw"
+      :size="drawer.size"
+      :with-header="false"
+      :visible.sync="drawer.visible"
+      :lazy="false"
+    >
+      <div
+        class="es-public-drawer-main"
+        v-if="showAi"
+        v-show="drawer.active === 'ai'"
+      >
+        <iframe
+          name="ai"
+          id="ai"
+          frameborder="0"
+          width="100%"
+          height="100%"
+          :src="aiConfig.url"
+        ></iframe>
+      </div>
+      <div
+        class="es-public-drawer-main"
+        v-if="drawer.im && drawer.im.url"
+        v-show="drawer.active === 'im'"
+      >
+        <iframe
+          frameborder="0"
+          width="100%"
+          height="100%"
+          :src="drawer.im.url"
+        ></iframe>
+      </div>
+    </es-drawer>
+    <!-- AI/IM end -->
   </div>
 </template>
 
@@ -185,9 +180,8 @@ import minxs from './minxs.js';
 import { getParams } from 'eoss/src/utils/util';
 import { getStorage } from 'eoss/src/utils/storage';
 import { aiIcon } from './icon.js';
-
 export default {
-  name: 'Early',
+  name: 'Gzw',
   mixins: [minxs],
   provide() {
     return {};
@@ -199,12 +193,12 @@ export default {
       return (this.aiConfig || {}).icon || aiIcon;
     },
     aiStyle() {
-      let styles = {}
-      if(this.aiConfig){
+      let styles = {};
+      if (this.aiConfig) {
         styles.width = this.aiConfig.width + 'px';
         styles.height = this.aiConfig.height + 'px';
       }
-      return this.aiFloat&&this.aiPosition.left>0&&this.aiPosition.top>0
+      return this.aiPosition.left > 0 && this.aiPosition.top > 0
         ? {
             left: this.aiPosition.left + 'px',
             top: this.aiPosition.top + 'px',
@@ -273,7 +267,7 @@ export default {
           0,
           this.parentSize.width - ((this.aiConfig || {}).width || 56)
         );
-        this.aiPosition.left
+        this.aiPosition.left;
         this.aiPosition.top = Math.max(
           0,
           this.parentSize.height - ((this.aiConfig || {}).height || 56)
@@ -284,14 +278,10 @@ export default {
     handleClickAi() {
       // 只有非拖动状态才执行点击
       if (this.isDragging || this.hasDragged) return;
-      //this.aiFloat = !this.aiFloat;
-      this.aiFloat = false;
-      //this.aiOpen = true;
-      //this.handlerSetDrawer(this.aiConfig, 'ai', 'rtl');
+      this.handlerSetDrawer({type: 'ai', direction: 'rtl', visible: true});
     },
 
     startDrag(event) {
-      if (!this.aiFloat) return;
       // 只响应鼠标左键
       if (event.button !== 0) return;
 
@@ -324,8 +314,6 @@ export default {
       this.parentSize.width = parentRect.width;
       this.parentSize.height = parentRect.height;
 
-      
-
       // 设置全局样式
       document.body.style.cursor = 'grabbing';
       document.body.style.userSelect = 'none';
@@ -360,8 +348,14 @@ export default {
       let newLeft = this.dragStart.left + moveX;
       let newTop = this.dragStart.top + moveY;
 
-      const maxLeft = Math.max(0, this.parentSize.width - ((this.aiConfig || {}).width || 56));
-      const maxTop = Math.max(0, this.parentSize.height - ((this.aiConfig || {}).height || 56));
+      const maxLeft = Math.max(
+        0,
+        this.parentSize.width - ((this.aiConfig || {}).width || 56)
+      );
+      const maxTop = Math.max(
+        0,
+        this.parentSize.height - ((this.aiConfig || {}).height || 56)
+      );
 
       newLeft = Math.max(0, Math.min(newLeft, maxLeft));
       newTop = Math.max(54, Math.min(newTop, maxTop));

package/packages/main/src/minxs.js

@@ -33,13 +33,15 @@ import {
   loading,
   updateTheme,
   getWinTop,
-  exclAttribute
+  exclAttribute,
+  getParams
 } from 'eoss/src/utils/util';
 import { getStorage, setStorage, removeStorage} from 'eoss/src/utils/storage';
 import { timeCycle } from 'eoss/src/utils/date';
 import { socket } from 'eoss/src/utils/websocket';
 import { ajax, getMainConfig } from 'eoss/src/utils/ajax';
 import { isObject } from 'eoss/src/utils/types';
+const appid = getParams('applicationId');
 /**
  * 主框架组件（早期版本）
  * 功能说明：提供完整的系统布局框架，包含应用菜单、子菜单、消息通知、设置面板等功能
@@ -481,8 +483,8 @@ export default {
       // 公用窗口面板配置
       drawer: {
         visible: false,
+        size: '100%',
         direction: 'ltr',
-        ai: {},
         im: {},
         active: ''
       },
@@ -621,6 +623,8 @@ export default {
             bus.$on('windowOpen', this.winOpen);
             bus.$on('windowClose', this.winClose);
             bus.$on('jumpMenu', this.jumpMenu);
+            bus.$on('sendMsg', this.sendMsg);
+            bus.$on('handleClickApp', this.handleClickApp);
             bus.$on('emit', (method, args) => {
               // 主应用发送事件
               bus.$emit(method, args);
@@ -634,6 +638,8 @@ export default {
           window.menuRefresh = this.handleRefresh;
           window.jumpMenu = this.jumpMenu;
           window.changeAi = this.changeAi;
+          window.sendMsg = this.sendMsg;
+          window.handleClickApp = this.handleClickApp;
 
           window.addEventListener('message', this.handleMessage);
         });
@@ -674,6 +680,8 @@ export default {
         bus.$off('jumpMenu');
         bus.$off('emit');
         bus.$off('changeAi');
+        bus.$off('sendMsg');
+        bus.$off('handleClickApp');
       }
 
       // 清除全局变量，防止内存泄漏
@@ -684,6 +692,8 @@ export default {
       delete window.menuRefresh;
       delete window.jumpMenu;
       delete window.changeAi;
+      delete window.sendMsg;
+      delete window.handleClickApp;
     },
     /**
      * @desc: 切换布局风格
@@ -966,22 +976,59 @@ export default {
         case 'changeAi': // 人工智能是否展开
           this.changeAi(args);
           break;
+        case 'sendMsg':
+          this.sendMsg(args);
+          break;
+        case 'handleClickApp':
+          this.handleClickApp(args);
+          break;
       }
     },
+    sendMsg(res) {
+      let iframe = null;
+      if (res.id) {
+        iframe = document.getElementById(res.id);
+      } else if (res.name) {
+        iframe = document.querySelector(`iframe[name="${res.name}"]`);
+      }
+      if (!iframe) {
+        iframe = document.querySelector('iframe');
+      }
+      if (iframe) {
+        if (Array.isArray(iframe)) {
+          iframe.forEach((item) => {
+            item.contentWindow.postMessage(res.data, '*');
+          });
+        } else {
+          iframe.contentWindow.postMessage(res.data, '*');
+        }
+      }
+
+    },
     /**
      * @desc:改变人工智能状态
      * @author huangbo
      * @date 2024年9月7日
      **/
-    changeAi(type) {
+    changeAi(res) {
+      if (!res) {
+        return;
+      }
+      let config = {};
+      let type = 'open';
+      if (typeof res === 'string') {
+        type = res;
+      } else {
+        const { type: resType, ...other } = res;
+        config = other;
+        type = resType;
+      }
       if (type === 'open') {
+        this.handlerSetDrawer({type: 'ai', direction: 'rtl', ...config, visible: true});
         this.aiOpen = true;
-      } else if (type === 'close') {
-        this.aiOpen = false;
-      } else if (type === 'full') {
-        this.aiFull = !this.aiFull;
-      } else if (type === 'float') {
-        this.aiFloat = !this.aiFloat;
+      } else if (type === 'close' || type === 'float') {
+        this.handlerSetDrawer({type: 'ai', direction: 'rtl', ...config, visible: false});
+        // this.aiOpen = false;
       }
     },
     /**
@@ -1197,6 +1244,7 @@ export default {
             } else {
               this.aiConfig = {width: 56, height: 56, ...res[i]};
             }
+            this.aiConfig.float && (this.aiFloat = true);
             break;
           case 'imConfig':
             if (typeof res[i] === 'string') {
@@ -1406,24 +1454,52 @@ export default {
     renderMenus(res) {
       this.menus = res;
       this.setTips(this.menus);
-      if (this.indexUrl) {
-        let obj = this.getMenu(this.menuApps, this.indexUrl);
+      if (appid || this.indexUrl) {
+        let obj = null;
+        if (appid) {
+          obj = this.getMenu(this.menuApps, appid, 'id');
+        }
         if (!obj) {
-          obj = this.getMenu(this.menus, this.indexUrl);
+          obj = this.getMenu(this.menus, appid, 'id');
         }
-        obj = obj
-          ? JSON.parse(JSON.stringify(obj))
-          : {
-            url: this.indexUrl,
-            text: this.indexTitle,
-            id: '0',
-            appCode: 'indexUrl'
-          };
-        this.homePage = this.setIframeType(obj);
+        if (!obj) {
+          console.error('未找到应用菜单', appid);
+        } else {
+          obj = JSON.parse(JSON.stringify(obj));
+        }
+        let homePage = null;
+        if (this.indexUrl) {
+          homePage = this.getMenu(this.menuApps, this.indexUrl);
+        }
+        if (!homePage) {
+          homePage = this.getMenu(this.menus, this.indexUrl);
+        }
+        homePage = homePage ? JSON.parse(JSON.stringify(homePage)) : {
+          url: this.indexUrl,
+          text: this.indexTitle,
+          id: '0',
+          appCode: 'indexUrl'
+        };
+        this.homePage = this.setIframeType(homePage);
         if (!this.appCode) {
-          this.active = this.homePage.id;
-          this.tabs = [this.homePage];
-          this.activeName = this.homePage.id;
+          const tid = (obj || {}).id || this.homePage.id;
+          const source = (obj || {}).source || this.homePage.source;
+          this.subMenus = this.getRootMenu(this.menus, tid);
+          this.active = tid;
+          this.tabs = [obj || this.homePage];
+          this.activeName = tid;
+          if (this.subMenus) {
+            this.tabMenus[tid] = this.subMenus;
+            this.showMenu = true;
+          } else {
+            this.showMenu = false;
+          }
+          if (this.isFourthTabs && source && source === 'fourthTabs') {
+            const parentMenu = this.getParentMenu(this.menus, obj || this.homePage);
+            this.subActive = parentMenu.id;
+          } else {
+            this.subActive = tid;
+          }
         }
       }
       if (this.appCode) {
@@ -2028,18 +2104,19 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    handlerSetDrawer(res, type, direction = 'ltr') {
-      this.drawer.visible = true;
+    handlerSetDrawer({type, direction = 'ltr', visible = true, size = '100%'}) {
+      this.drawer.visible = visible;
       this.drawer.active = type;
       this.drawer.direction = direction;
-      if (res) {
-        let { mounted, url } = res;
-        this.drawer[type] = {
-          mounted,
-          url,
-          name: res.name || uuid()
-        };
-      }
+      this.drawer.size = type === 'ai' ? this.aiConfig.size || size : type === 'im' ? this.imConfig.size || size : size;
+      // if (res) {
+      //   let { mounted, url } = res;
+      //   this.drawer[type] = {
+      //     mounted,
+      //     url,
+      //     name: res.name || uuid()
+      //   };
+      // }
     },
     /**
      * @desc:关闭Drawer界面
@@ -2270,10 +2347,10 @@ export default {
             this.showSet = false;
             break;
           case 'ai':
-            this.handlerSetDrawer(this.aiConfig, 'ai', 'rtl');
+            this.handlerSetDrawer({type: 'ai', direction: 'rtl', visible: true});
             break;
           case 'im':
-            this.handlerSetDrawer(this.imConfig, 'im', 'rtl');
+            this.handlerSetDrawer({type: 'im', direction: 'rtl', visible: true});
             break;
           case 'goView':
             window.open(res.path, '_blank');

package/packages/pagination/src/pager.vue

@@ -203,9 +203,9 @@ export default {
 
       // 处理快速跳转按钮
       if (target.classList.contains('more')) {
-        if (target.classList.contains('quickprev')) {
+        if (target.classList.contains('btn-quickprev')) {
           newPage = currentPage - pagerCountOffset;
-        } else if (target.classList.contains('quicknext')) {
+        } else if (target.classList.contains('btn-quicknext')) {
           newPage = currentPage + pagerCountOffset;
         }
       }

package/packages/pagination/src/pagination.js

@@ -110,7 +110,10 @@ export default {
      * @type {Boolean}
      * @default false
      */
-    background: Boolean,
+    background: {
+      type: Boolean,
+      default: true
+    },
     /**
      * 是否显示边框
      * @type {Boolean}

package/packages/qrcode-login/src/qrcode-login.vue

@@ -81,7 +81,7 @@ export default {
      * 二维码宽度
      * @type {Number}
      */
-    width: Number,
+    width: [Number, String],
     /**
      * 扫码登录轮询时间间隔
      * @type {Number}
@@ -108,7 +108,11 @@ export default {
       return this.content || this.identifyingId;
     },
     _width() {
-      return this.width || DEFAULT_SIZE[this.size] || DEFAULT_SIZE.default;
+      if(this.width){
+        return parseInt(this.width);
+      }
+      const sizes = (this.$EOSS || {}).qrCodeSize || DEFAULT_SIZE;
+      return sizes[this.size];
     }
   },
   watch: {},

package/packages/select/src/select.vue

@@ -163,6 +163,12 @@
           v-show="options.length > 0 && !loading"
         >
           <slot>
+            <es-option
+              class="es-select-dropdown__item-created"
+              :value="query"
+              created
+              v-if="showNewOption"
+            ></es-option>
             <es-option-tree
               v-if="tree"
               ref="selectTree"
@@ -177,7 +183,7 @@
                 'node-collapse': handleCollapse
               }"
             ></es-option-tree>
-            <template v-else-if="showNewOption || results.length">
+            <template v-else-if="results.length">
               <template v-if="results.length">
                 <template v-for="item in results">
                   <es-option-group
@@ -187,13 +193,23 @@
                   >
                     <es-option
                       v-for="child in item.children"
-                      :key="child.key || child.id || child[labelKey] || child"
+                      :key="
+                        child.key ||
+                        child.id ||
+                        child[labelKey] ||
+                        JSON.stringify(child)
+                      "
                       v-bind="getProps(child)"
                     ></es-option>
                   </es-option-group>
                   <es-option
                     v-else
-                    :key="item.key || item.id || item[labelKey] || item"
+                    :key="
+                      item.key ||
+                      item.id ||
+                      item[labelKey] ||
+                      JSON.stringify(item)
+                    "
                     v-bind="getProps(item)"
                   ></es-option>
                 </template>
@@ -1637,9 +1653,15 @@ export default {
     },
 
     getValueKey(item) {
-      return this.getType(item.value) !== '[object object]'
-        ? item.value
-        : getValueByPath(item.value, this.valueKey);
+      const value =
+        this.getType(item.value) !== '[object object]'
+          ? item.value
+          : getValueByPath(item.value, this.valueKey);
+      // 确保返回字符串或数字类型的key
+      if (typeof value === 'object') {
+        return JSON.stringify(value);
+      }
+      return value;
     },
     handleExpand(data, node) {
       this.$emit('node-expand', data, node);

package/packages/steps/src/step.vue

@@ -32,7 +32,7 @@
                   :events="item.events"
                   @click.stop="item.event"
                 />
-                <field-renderer
+                <field-render
                   :key="item.key || item.id || index"
                   v-else-if="
                     ['radio', 'checkbox', 'select', 'switch'].includes(
@@ -40,7 +40,7 @@
                     )
                   "
                   v-bind="item"
-                ></field-renderer>
+                ></field-render>
               </template>
             </template>
           </template>
@@ -118,7 +118,7 @@
                   :events="item.events"
                   @click.stop="item.event"
                 />
-                <field-renderer
+                <field-render
                   :key="item.key || item.id || index"
                   v-else-if="
                     ['radio', 'checkbox', 'select', 'switch'].includes(
@@ -126,7 +126,7 @@
                     )
                   "
                   v-bind="item"
-                ></field-renderer>
+                ></field-render>
               </template>
             </template>
           </template>
@@ -149,6 +149,7 @@
 
 <script>
 import EsIcon from 'eoss/packages/icon/src/icon';
+import FieldRender from 'eoss/src/components/field-render.vue';
 
 /**
  * Step 步骤项组件
@@ -165,7 +166,8 @@ export default {
   name: 'EsStep',
 
   components: {
-    EsIcon
+    EsIcon,
+    FieldRender
   },
 
   props: {

package/packages/tabs/src/tab-nav.vue

@@ -558,6 +558,7 @@ export default {
         class={[
           'es-tabs__nav-wrap',
           hideAfter ? 'is-hide' : '',
+          scrollable ? 'is-scrollable' : '',
           `is-${this.rootTabs.tabPosition}`
         ]}
       >

package/packages/tabs/src/tabs.vue

@@ -309,9 +309,7 @@ export default {
           ''
         )}
         {newButton}
-        <div class={['es-tabs__nav-main', `is-${tabPosition}`]}>
           <tab-nav {...navData} class={[hideBar ? 'is-hide' : '']} />
-        </div>
         {this.$slots.append ? (
           <div
             ref={'append'}

package/packages/theme-chalk/gulpfile.js

@@ -23,6 +23,9 @@ function compile() {
     .pipe(dest('./lib'));
 }
 
+/**
+ * 复制字体文件
+ */
 function copyfont() {
   return src('./src/fonts/**')
     .pipe(dest('./lib/fonts'))

package/packages/theme-chalk/src/account-login.scss

@@ -1,6 +1,7 @@
 @import 'common/var.scss';
 @import './mixins/mixins.scss';
 @include b(account-login) {
+  height: auto !important;
   .es-input--prefix {
     .es-input__prefix {
       color: $--font-color-base;

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

@@ -254,4 +254,4 @@ table {
 }
 .es-icon_image {
   vertical-align: middle;
-}
+}

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

@@ -1509,3 +1509,19 @@ $--breakpoints-spec: (
     min-width: $--xl
   )
 );
+/* Login
+--------------------------*/
+
+$--login-width: 460px !default;
+$--login-width-large: $--login-width !default;
+$--login-width-base: $--login-width * 0.9 !default;
+$--login-width-medium: $--login-width * 0.8 !default;
+$--login-width-small: $--login-width * 0.7 !default;
+$--login-width-mini: $--login-width * 0.6 !default;
+
+$--login-padding: 40px !default;
+$--login-padding-large: $--login-padding !default;
+$--login-padding-base: $--login-padding * 0.8 !default;
+$--login-padding-medium: $--login-padding * 0.6 !default;
+$--login-padding-small: $--login-padding * 0.6 !default;
+$--login-padding-mini: $--login-padding * 0.5 !default;