eoss-ui 0.6.40 → 0.6.41

package/packages/main/src/simplicity/handler.vue

@@ -24,7 +24,7 @@
         </div>
       </div>
       <div
-        v-else-if="item.type === 'online'"
+        v-else-if="item.type === 'online' || item.type === 'onlineUser'"
         class="es-simplicity-online"
         :key="item.type"
       >
@@ -40,7 +40,7 @@
       </div>
       <el-badge
         class="es-simplicity-handler-item"
-        v-else-if="item.type === 'notice'"
+        v-else-if="item.type === 'notice' || item.type === 'messsage'"
         :key="item.type"
         :value="noticeNum"
         :max="99"
@@ -73,31 +73,64 @@ export default {
   props: {
     contact: Object,
     dateTime: {
-      type: Boolean,
-      default: true
+      type: [Boolean, Object],
+      default() {
+        return { type: 'dateTime' };
+      },
+      validator: (val) => {
+        return val === false || typeof val === 'object';
+      }
+    },
+    onlineUser: {
+      type: [Boolean, Object],
+      default() {
+        return { type: 'onlineUser' };
+      },
+      validator: (val) => {
+        return val === false || typeof val === 'object';
+      }
     },
     search: {
-      type: Object,
+      type: [Boolean, Object],
       default() {
         return {
           type: 'search',
           icon: 'es-icon-magnifier',
           title: '搜索'
         };
+      },
+      validator: (val) => {
+        return val === false || typeof val === 'object';
+      }
+    },
+    im: {
+      type: [Boolean, Object],
+      default() {
+        return {
+          type: 'im',
+          icon: 'es-icon-liaotian',
+          title: 'IM'
+        };
+      },
+      validator: (val) => {
+        return val === false || typeof val === 'object';
       }
     },
     index: {
-      type: Object,
+      type: [Boolean, Object],
       default() {
         return {
           type: 'index',
           icon: 'es-icon-home',
           title: '门户'
         };
+      },
+      validator: (val) => {
+        return val === false || typeof val === 'object';
       }
     },
     home: {
-      type: Object,
+      type: [Boolean, Object],
       default() {
         return {
           type: 'home',
@@ -107,7 +140,7 @@ export default {
       }
     },
     notice: {
-      type: Object,
+      type: [Boolean, Object],
       default() {
         return {
           type: 'notice',
@@ -117,7 +150,7 @@ export default {
       }
     },
     quit: {
-      type: Object,
+      type: [Boolean, Object],
       default() {
         return {
           type: 'quit',
@@ -127,24 +160,29 @@ export default {
       }
     },
     set: {
-      type: Object,
+      type: [Boolean, Object],
       default() {
         return {
           type: 'set',
           icon: 'es-icon-xitongguanli',
           title: '设置'
         };
+      },
+      validator: (val) => {
+        return val === false || typeof val === 'object';
       }
     },
     data: Array,
     hide: {
       type: Object,
       default() {
-        return {
-          old: true
-        };
+        return {};
       }
     },
+    msgNum: {
+      type: Number,
+      default: 0
+    },
     noticeNum: {
       type: Number,
       default: 0
@@ -163,21 +201,19 @@ export default {
   },
   computed: {
     lists() {
-      let df = [];
-      if (this.contact) {
-        df.push({ ...this.contact, type: 'contact' });
-      }
-      if (this.dateTime) {
-        df.push({ type: 'dateTime' });
-      }
-      if (this.online) {
-        df.push({ type: 'online' });
-      }
+      let hide = {
+        old: true,
+        im: true,
+        ...this.hide
+      };
       let data = this.data
-        ? [...df, ...this.data]
+        ? this.data
         : [
-            ...df,
+            this.contact ? { ...this.contact, type: 'contact' } : {},
+            this.dateTime,
+            this.onlineUser,
             this.search,
+            this.im,
             this.index,
             this.home,
             this.notice,
@@ -185,7 +221,9 @@ export default {
             this.set
           ];
       return data.filter((item) => {
-        return !this.hide[item.type];
+        return (
+          item && Object.keys(item).length && !item.hide && !hide[item.type]
+        );
       });
     },
     isClick() {

package/packages/main/src/simplicity/index.vue

@@ -91,7 +91,7 @@
         class="es-simplicity-side-app"
         v-if="_aiConfig"
         :style="_aibackground"
-        @click="handlerSetDrawer(_aiConfig)"
+        @click="handlerSetDrawer(_aiConfig, 'ai')"
       >
         <es-icon
           v-show="_aiConfig.icon"
@@ -118,27 +118,27 @@
       ></apps>
       <!-- 应用 end -->
 
-      <!-- AI -->
+      <!-- AI/IM -->
       <el-drawer
         class="es-simplicity-public-drawer"
-        direction="ltr"
+        :direction="drawer.direction"
         modal-class="es-simplicity-apps-modal"
         size="100%"
         show-close
         :modal-append-to-body="false"
         :visible.sync="drawer.visible"
       >
-        <!-- <i
-          class="es-icon-close es-simplicity-drawer-close"
-          @click="handleCloseDrawer"
-        ></i> -->
-        <template v-if="drawer.url">
-          <template v-if="isIE || drawer.method !== 'wujie'">
+        <div
+          class="es-simplicity-public-drawer-main"
+          v-if="drawer.ai && drawer.ai.url"
+          v-show="drawer.active == 'ai'"
+        >
+          <template v-if="isIE || drawer.ai.method !== 'wujie'">
             <iframe
               frameborder="0"
               width="100%"
               height="100%"
-              :src="drawer.url"
+              :src="drawer.ai.url"
             ></iframe>
           </template>
           <template v-else>
@@ -147,13 +147,37 @@
               :show="true"
               :props="wjProps"
               :attrs="wjAttrs"
-              :name="drawer.name"
-              :url="drawer.url"
+              :name="drawer.ai.name"
+              :url="drawer.ai.url"
             ></es-wujie>
           </template>
-        </template>
+        </div>
+        <div
+          class="es-simplicity-public-drawer-main"
+          v-if="drawer.im && drawer.im.url"
+          v-show="drawer.active == 'im'"
+        >
+          <template v-if="isIE || drawer.im.method !== 'wujie'">
+            <iframe
+              frameborder="0"
+              width="100%"
+              height="100%"
+              :src="drawer.im.url"
+            ></iframe>
+          </template>
+          <template v-else>
+            <es-wujie
+              :host="host"
+              :show="true"
+              :props="wjProps"
+              :attrs="wjAttrs"
+              :name="drawer.im.name"
+              :url="drawer.im.url"
+            ></es-wujie>
+          </template>
+        </div>
       </el-drawer>
-      <!-- AI end -->
+      <!-- AI/IM end -->
 
       <!-- 路由、iframe -->
       <div class="es-simplicity-tabs-handler-mask" v-show="showTabsHandler">
@@ -487,6 +511,8 @@ export default {
     },
     //人工智能配置
     ai: Object,
+    //im
+    im: Object,
     //iframeId
     iframeId: {
       type: String,
@@ -557,9 +583,15 @@ export default {
       fold: false,
       //人工智能配置
       aiConfig: null,
+      //im配置
+      imConfig: null,
       //公用窗口面板配置
       drawer: {
-        visible: false
+        visible: false,
+        direction: 'ltr',
+        ai: {},
+        im: {},
+        active: ''
       },
       //所有应用
       applications: [],
@@ -657,6 +689,10 @@ export default {
           }
         : {};
     },
+    //人工智能配置
+    _imConfig() {
+      return this.imConfig || this.im;
+    },
     //用户信息
     user() {
       return this.userModel ? this.userModel : store.get('userModel');
@@ -870,6 +906,17 @@ export default {
               this.aiConfig = results[i].aiConfig;
             }
           }
+          if (results[i].imConfig) {
+            if (typeof results[i].imConfig == 'string') {
+              try {
+                this.imConfig = JSON.parse(results[i].imConfig);
+              } catch (error) {
+                this.imConfig = { url: results[i].imConfig };
+              }
+            } else {
+              this.imConfig = results[i].imConfig;
+            }
+          }
           if (results[i].portalPage || results[i].portalpage) {
             this.doorIndex = results[i].portalPage || results[i].portalpage;
           }
@@ -1485,12 +1532,17 @@ export default {
      * @author huangbo
      * @date 2024年9月7日
      **/
-    handlerSetDrawer(res) {
-      this.drawer.visible = !this.drawer.visible;
-      this.drawer.mounted = res.mounted;
-      this.drawer.url = res.url;
-      if (res.mounted === 'wujie') {
-        this.drawer.name = res.name || util.uuid();
+    handlerSetDrawer(res, type, direction = 'ltr') {
+      this.drawer.visible = true;
+      this.active = type;
+      this.drawer.direction = direction;
+      if (!this.drawer[type] && res) {
+        let { mounted, url } = res;
+        this.drawer[type] = {
+          mounted,
+          url,
+          name: res.name || util.uuid()
+        };
       }
     },
     /**
@@ -1741,14 +1793,16 @@ export default {
             this.showSet = false;
             break;
           case 'search':
-            if (res.url) {
-              this.handlerSetDrawer(res);
-            } else {
-              this.showSearch = true;
-            }
+            this.showSearch = true;
             this.showMsg = false;
             this.showSet = false;
             break;
+          case 'ai':
+            this.handlerSetDrawer(this._aiConfig, 'ai', 'rtl');
+            break;
+          case 'im':
+            this.handlerSetDrawer(this._imConfig, 'im', 'rtl');
+            break;
           case 'goView':
             util.win.open(res.path, '_blank');
             break;

package/packages/selector/src/main.vue

@@ -7,9 +7,12 @@
     v-clickoutside="handleClose"
   >
     <template v-if="form">
-      <el-button v-if="button" v-bind="button" @click="openDialog"
-        ><slot>选择</slot></el-button
-      >
+      <el-button v-if="button" v-bind="button" @click="openDialog">
+        <slot>
+          <es-icon v-if="icon" :contents="icon"></es-icon>
+          <template v-else>选择</template>
+        </slot>
+      </el-button>
       <template v-else>
         <div
           :class="[
@@ -98,8 +101,12 @@
                     ref="openDialog"
                     v-if="filterable || showButton"
                     @click.stop="openDialog"
-                    ><slot>选择</slot></el-button
                   >
+                    <slot>
+                      <es-icon v-if="icon" :contents="icon"></es-icon>
+                      <template v-else>选择</template>
+                    </slot>
+                  </el-button>
                 </template>
               </el-input>
               <el-input
@@ -139,8 +146,12 @@
                   ref="openDialog"
                   v-if="filterable || showButton"
                   @click.stop="openDialog"
-                  ><slot>选择</slot></el-button
                 >
+                  <slot>
+                    <es-icon v-if="icon" :contents="icon"></es-icon>
+                    <template v-else>选择</template>
+                  </slot>
+                </el-button>
               </template>
             </el-input>
           </template>
@@ -317,6 +328,7 @@ export default {
       default: false
     },
     button: Object,
+    icon: String,
     active: String,
     keywords: {
       type: String,

package/packages/selector-panel/src/main.vue

@@ -518,7 +518,6 @@ export default {
         if (this.replace) {
           return this.tabs;
         } else {
-          console.log(util.extend(true, tabs, this.tabs), 'this.tabs');
           return util.extend(true, tabs, this.tabs);
         }
       }