eoss-ui 0.4.21 → 0.4.23

package/packages/icon/src/main.vue

@@ -0,0 +1,83 @@
+<template>
+  <div class="es-icon" :class="{ 'es-icon-readonly': readonly }">
+    <el-input
+      v-if="!readonly"
+      v-bind="$attrs"
+      v-on="$listeners"
+      :placeholder="placeholder"
+      readonly
+      v-model="model"
+    >
+      <i class="es-iconfont" :class="model" slot="prepend" v-if="model"></i>
+      <el-button slot="suffix" type="primary" size="small" @click="handleClick"
+        >选择</el-button
+      >
+    </el-input>
+    <i class="es-iconfont" :class="model" slot="prepend" v-else></i>
+    <es-dialog title="选择图标" :visible.sync="visible">
+      <el-scrollbar class="es-scrollbar" ref="scrollbar">
+        <ul class="es-icon-list">
+          <li
+            v-for="name in $icon"
+            :key="name"
+            @click.stop="handleSelect(name)"
+          >
+            <span>
+              <i :class="'es-icon-' + name"></i>
+              <span class="icon-name">{{ 'es-icon-' + name }}</span>
+            </span>
+          </li>
+        </ul>
+      </el-scrollbar>
+    </es-dialog>
+  </div>
+</template>
+<script>
+//import util from 'eoss-ui/src/utils/util';
+export default {
+  name: 'EsIcon',
+  inheritAttrs: false,
+  props: {
+    value: String,
+    placeholder: {
+      type: String,
+      default: '请选择图标'
+    },
+    readonly: Boolean
+  },
+  computed: {
+    model: {
+      get() {
+        return this.value ? this.value : this.icon;
+      },
+      set(val) {
+        return val;
+      }
+    }
+  },
+  watch: {
+    model(val) {
+      this.$emit('change', val);
+    }
+  },
+  data() {
+    return {
+      icon: null,
+      visible: false
+    };
+  },
+  created() {
+    //this.loadsub(this.param);
+  },
+  methods: {
+    handleClick() {
+      this.visible = true;
+    },
+    handleSelect(name) {
+      this.$emit('input', `es-icon-${name}`);
+      this.icon = `es-icon-${name}`;
+      this.visible = false;
+    }
+  }
+};
+</script>

package/packages/main/src/async-component/index.vue

@@ -0,0 +1,85 @@
+<!--
+ * @Description: 异步加载网络UMD组件
+ * @Version: 1.0
+ * @Autor: zhaodongming
+ * @Date: 2022-12-01 16:32:36
+ * @LastEditors: zhaodongming
+ * @LastEditTime: 2023-01-18 11:49:54
+-->
+<template>
+  <component :is="comp" v-bind="$attrs" v-on="$listeners"></component>
+</template>
+
+<script>
+import { importScript } from 'runtime-import';
+import util from 'eoss-ui/src/utils/util'
+export default {
+  name: 'AsyncComponent',
+  inheritAttrs: true,
+  props: {
+    componentRenderUrl: {
+      type: [String, Object],
+      default: ''
+    }
+  },
+  data() {
+    return {
+      comp: 'div'
+    };
+  },
+  watch: {
+    componentRenderUrl: {
+      immediate: true,
+      handler: function(newVal) {
+        this.handleImport(newVal);
+      }
+    }
+  },
+  methods: {
+    async handleImport(url = '') {
+      try {
+        // 如果不是url,当作倒入组件名处理
+        if (
+          url.indexOf &&
+          (url.indexOf('http:') != -1 ||
+            url.indexOf('https:') != -1 ||
+            url.indexOf('/dev-api') != -1)
+        ) {
+          // 获取缓存中的组件
+          const catchComponent = util.win[url];
+          if (catchComponent) {
+            // 渲染缓存中的组件
+            this.comp = catchComponent;
+            // 回传props内容
+            this.$emit('handleGetProps', this.comp.props);
+          } else {
+            // 加载远端umd格式组件内容
+            const comp = await importScript(url);
+            // 渲染远端组件并缓存到磁盘
+            if (!comp) {
+              this.$message.error('不是合规组件,请检查组件上传环境和语法');
+              return;
+            }
+            this.comp = comp;
+            util.win[url] = comp;
+            // 回传props内容
+            this.$emit('handleGetProps', this.comp.props);
+          }
+        } else {
+          // 如果不是url则当作文本片段处理
+          this.comp = url;
+          // 回传props内容
+          // this.$emit('handleGetProps', this.comp.props);
+        }
+
+        // }
+        // debugger;
+      } catch (err) {
+        console.error(err);
+      }
+    }
+  }
+};
+</script>
+
+<style lang="scss" scoped></style>

package/packages/main/src/main.vue

@@ -5,10 +5,17 @@
       class="es-main-header"
       :style="{ backgroundImage: headerImg ? 'url(' + headerImg + ')' : '' }"
     >
+      <AsyncComponent
+        v-if="themeJSON.logo.comp"
+        :style="!themeJSON.topNav.comp ? 'width:100%' : ''"
+        :key="themeJSON.logo.comp"
+        v-bind="themeJSON.logo.data"
+        :componentRenderUrl="themeJSON.logo.comp"
+      />
       <img
         class="es-main-logo"
         :src="logoUrl"
-        v-if="modal !== 'topside' && logoUrl"
+        v-if="modal !== 'topside' && logoUrl && showDefault"
       />
       <div class="es-main-top-nav">
         <es-menu
@@ -27,7 +34,28 @@
           "
         ></es-menu>
       </div>
+      <AsyncComponent
+        v-if="themeJSON.topNav.comp"
+        :style="!themeJSON.logo.comp ? 'width:100%' : ''"
+        :hide="hide"
+        :subSystem="subsystem"
+        :online="online"
+        :application="application"
+        :storage="storage"
+        :notice="notice"
+        :data="handleData"
+        :key="themeJSON.topNav.comp"
+        v-bind="themeJSON.topNav.data"
+        :componentRenderUrl="themeJSON.topNav.comp"
+        @select="
+          (res) => {
+            handleSelect(res, 'sys');
+          }
+        "
+        @click="handleClick"
+      />
       <es-handler
+        v-if="showDefault"
         :userModel="userModel"
         :hide="hide"
         :subSystem="subsystem"
@@ -55,8 +83,33 @@
             @click="handleClick"
           ></es-handle-user>
         </div>
+        <AsyncComponent
+          v-if="themeJSON.leftNav.comp"
+          :biserial="biserial"
+          :newTitle="showNavTitle ? title : false"
+          :default-active="active"
+          :menu-tips="menuTips"
+          :scene="scene"
+          :key="themeJSON.leftNav.comp"
+          v-bind="themeJSON.leftNav.data"
+          :componentRenderUrl="themeJSON.leftNav.comp"
+          :newMenu="menu"
+          :application="application"
+          :menuUrl="menuUrl"
+          @trigger="
+            (res) => {
+              handleSelect(res, 'sub');
+            }
+          "
+          @select="
+            (res) => {
+              handleSelect(res, 'menu');
+            }
+          "
+          @success="menuSuccess"
+        />
         <es-nav
-          v-if="showMenu"
+          v-if="showMenu && showDefault"
           :data="menu"
           :default-active="active"
           :width="navWidth"
@@ -124,6 +177,19 @@
               /></keep-alive>
             </template>
           </div>
+          <AsyncComponent
+            style="
+              position: absolute;
+              height: 60px;
+              bottom: 0;
+              left: 0;
+              right: 0;
+            "
+            v-if="themeJSON.copyright.comp"
+            :key="themeJSON.copyright.comp"
+            v-bind="themeJSON.copyright.data"
+            :componentRenderUrl="themeJSON.copyright.comp"
+          />
           <message
             v-if="showMsg"
             ref="message"
@@ -174,11 +240,13 @@ import userinfo from './userinfo.vue';
 import settings from './settings.vue';
 import message from './message.vue';
 import notice from './notice.vue';
+import AsyncComponent from './async-component/index.vue';
 import {
   mainConfig,
   updateUserCustomInfo,
   getComplexApplications,
   getComplexApplicationsNew,
+  mainDetail,
   wss,
   topic
 } from 'eoss-ui/src/config/api.js';
@@ -195,6 +263,7 @@ export default {
     userinfo,
     settings,
     message,
+    AsyncComponent,
     notice
   },
   props: {
@@ -298,6 +367,10 @@ export default {
     remote: {
       type: Boolean,
       default: true
+    },
+    isCustomMain: {
+      type: Boolean,
+      default: false
     }
   },
   computed: {
@@ -426,6 +499,13 @@ export default {
   },
   data() {
     return {
+      showDefault: false,
+      themeJSON: {
+        logo: { comp: '', data: {} },
+        topNav: { comp: '', data: {} },
+        leftNav: { comp: '', data: {} },
+        copyright: { comp: '', data: {} }
+      },
       pageLoading: false,
       client: null,
       websocket: null,
@@ -492,6 +572,8 @@ export default {
       //是否展示侧边导航
       showMenu: true,
       props: {},
+      menuType: '',
+      customMenu: [],
       //是否首次加载
       isDefault: true,
       reset: true,
@@ -529,6 +611,60 @@ export default {
     util.win.windowOpen = this.openPage;
   },
   methods: {
+    menuSuccess(res) {
+      // this.menus
+      this.menuType = 'custom';
+      this.customMenu = res;
+      this.setMenu(res);
+    },
+    //获取主题模板JSON
+    getMainDetail(id) {
+      let params = {
+        url: mainDetail,
+        params: { id }
+      };
+      util
+        .ajax(params)
+        .then((res) => {
+          let _that = this;
+          if (!res.results) {
+            _that.showDefault = true;
+          }
+          if (res.rCode == 0) {
+            if (res.results && JSON.parse(res.results.layout)) {
+              // 初始化布局器
+              _that.themeJSON = JSON.parse(res.results.layout);
+              let count = 0;
+              for (let key in _that.themeJSON) {
+                if (_that.themeJSON[key].comp) {
+                  count++;
+                }
+              }
+              if (count == 0) {
+                _that.showDefault = true;
+              }
+              let theme = JSON.parse(res.results.theme);
+
+              util.updateTheme(theme.primaryColor);
+              _that.handleColorToPage(theme.globalThalk);
+            }
+          } else {
+            _that.$message.error('主题加载发生错误');
+            throw res.msg || '系统错误，请联系管理员！';
+          }
+          if (_that.showDefault && _that.data === undefined) {
+            _that.getMenu();
+          } else if (_that.showDefault) {
+            _that.menus = JSON.parse(JSON.stringify(_that.data));
+            _that.setMenu(_that.data);
+          }
+        })
+        .catch((err) => {
+          if (err.message && err.message !== 'canceled') {
+            this.$message.error(err.message);
+          }
+        });
+    },
     renderMenu() {
       if (this.data !== undefined && this.data.length) {
         this.menus = JSON.parse(JSON.stringify(this.data));
@@ -657,6 +793,14 @@ export default {
         store.set(i, results[i]);
       }
       this.userModel = results.userModel;
+      let mainFrameLayout = results.mainFrameLayout;
+      if (results.userStyle.layout && this.isCustomMain) {
+        this.getMainDetail(results.userStyle.layout);
+      } else if (this.isCustomMain) {
+        this.getMainDetail(mainFrameLayout);
+      } else {
+        this.showDefault = true;
+      }
     },
     //获取用户配置及信息
     getConfig() {
@@ -824,10 +968,19 @@ export default {
         }
         if (this.modal === 'subsystem' || this.modal === 'topside') {
           if (this.modal === 'subsystem') {
-            this.subsystem = res;
+            if (this.menuType === 'custom') {
+              this.subsystem = this.customMenu;
+            } else {
+              this.subsystem = res;
+            }
           } else if (this.modal === 'topside') {
-            this.navs = res;
-            this.topActive = res[0].id;
+            if (this.menuType === 'custom') {
+              this.navs = this.customMenu;
+              this.topActive = res[0].id;
+            } else {
+              this.navs = res;
+              this.topActive = res[0].id;
+            }
           }
           if (this.application) {
             for (let i = 0; i < res.length; i++) {
@@ -845,8 +998,13 @@ export default {
             this.active = this.getFirst(this.menu[0]);
           }
         } else if (this.modal === 'topnav') {
-          this.navs = res;
-          this.topActive = this.getFirst(res[0]);
+          if (this.menuType === 'custom') {
+            this.navs = this.customMenu;
+            this.topActive = this.getFirst(res[0]);
+          } else {
+            this.navs = res;
+            this.topActive = this.getFirst(res[0]);
+          }
         } else {
           this.menu = res;
           if (!this.isDefault) {
@@ -956,16 +1114,26 @@ export default {
         this.modal === 'topSide'
       ) {
         if (this.modal === 'subsystem' || this.modal === 'subSystem') {
-          this.subsystem = res;
-          this.sysId = active[0];
+          if (this.menuType === 'custom') {
+            this.subsystem = this.customMenu;
+            this.sysId = active[0];
+          } else {
+            this.subsystem = res;
+            this.sysId = active[0];
+          }
         } else if (
           this.modal === 'topnav' ||
           this.modal === 'topNav' ||
           this.modal === 'topside' ||
           this.modal === 'topSide'
         ) {
-          this.navs = res;
-          this.topActive = active[0];
+          if (this.menuType === 'custom') {
+            this.navs = this.customMenu;
+            this.topActive = active[0];
+          } else {
+            this.navs = res;
+            this.topActive = active[0];
+          }
         }
         if (this.tabs.length || this.isTabs) {
           this.tabsId = active[active.length - 1];
@@ -1173,7 +1341,7 @@ export default {
           if (this.homePage) {
             this.handleJump(this.homePage);
           }
-          this.active = '';
+          this.active = [];
           this.defaultActive = [];
           this.tabs = [];
           this.setMenu(this.menus);
@@ -1215,6 +1383,7 @@ export default {
     },
     //跳转页面
     handleJump(page, type, res) {
+      console.log(page);
       if (util.win.location.hash === page) {
         this.refresh = true;
         return;

package/packages/mainComp/src/main.vue

@@ -581,10 +581,10 @@ export default {
       showMenu: true,
       props: {},
       menuType: '',
+      customMenu: [],
       //是否首次加载
       isDefault: true,
       reset: true,
-      customMenu: [],
       isKeepAlive: this.keepAlive,
       routerKey: '',
       defaultwjprops: {}

package/packages/select/src/main.vue

@@ -290,8 +290,9 @@ export default {
     },
     getData(sysCode, param, reload) {
       if (
-        !this.ajax ||
-        (!this.isNoParamRequest && Object.keys(this.param).length == 0)
+        !reload &&
+        (!this.ajax ||
+          (!this.isNoParamRequest && Object.keys(this.param).length == 0))
       ) {
         return false;
       }
@@ -328,6 +329,8 @@ export default {
             if (sysCode) {
               store.set(sysCode, JSON.parse(JSON.stringify(this.options)));
             }
+          } else {
+            this.$message.error(res.msg);
           }
         })
         .catch((err) => {
@@ -472,8 +475,8 @@ export default {
       }
       return '';
     },
-    reload(param) {
-      this.getData(null, param, true);
+    reload() {
+      this.getData(...arguments);
     },
     handleExpand(data, node) {
       if (this.onExpand) {

package/packages/tabs/src/main.vue

@@ -529,6 +529,7 @@
                     contents.type === 'flow-list' ||
                     contents.type === 'flowList'
                 }"
+                :zoom="zoom"
                 :display="show"
                 v-on="contents.events"
               >

package/packages/theme-chalk/lib/es-icon.css

@@ -0,0 +1 @@
+.es-icon{display:inline-block}.es-icon.es-icon-readonly{-webkit-appearance:none;background-color:#fff;background-image:none;border-radius:3px;border:1px solid #d9d9d9;-webkit-box-sizing:border-box;box-sizing:border-box;color:rgba(0,0,0,.75);display:inline-block;font-size:inherit;height:40px;line-height:40px;outline:0;padding:0 15px;-webkit-transition:border-color .2s cubic-bezier(.645,.045,.355,1);transition:border-color .2s cubic-bezier(.645,.045,.355,1);width:100%;position:relative}.es-icon .el-input-group__prepend{width:auto;line-height:38px;position:absolute;z-index:3;left:2px;top:2px;right:62px;bottom:2px;border:0;background-color:#fff;padding:0 12px}.es-icon .es-iconfont{color:#606266;font-size:20px}.es-icon .el-input__inner{border-radius:3px!important;color:transparent;padding-right:60px}.es-icon .el-input__suffix{height:auto;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.es-icon-list{clear:both;overflow:hidden;list-style:none;padding:0!important;border:1px solid #eaeefb;border-radius:4px}.es-icon-list li{float:left;width:148px;text-align:center;height:120px;line-height:120px;color:#666;font-size:13px;border-right:1px solid #eee;border-bottom:1px solid #eee;margin-right:-1px;margin-bottom:-1px;-webkit-box-sizing:border-box;box-sizing:border-box}.es-icon-list li span{display:inline-block;line-height:normal;vertical-align:middle;font-family:'Helvetica Neue',Helvetica,'PingFang SC','Hiragino Sans GB','Microsoft YaHei',SimSun,sans-serif;color:#99a9bf;-webkit-transition:color .15s linear;transition:color .15s linear}.es-icon-list li i{display:block;font-size:32px;margin-bottom:15px;color:#606266;-webkit-transition:color .15s linear;transition:color .15s linear}.es-icon-list li .icon-name{display:inline-block;padding:0 3px;height:1em}.es-icon-list li:hover i,.es-icon-list li:hover span{color:#5cb6ff}

package/packages/theme-chalk/src/es-icon.scss

@@ -0,0 +1,99 @@
+.es-icon {
+  display: inline-block;
+  &.es-icon-readonly {
+    -webkit-appearance: none;
+    background-color: #fff;
+    background-image: none;
+    border-radius: 3px;
+    border: 1px solid #d9d9d9;
+    -webkit-box-sizing: border-box;
+    box-sizing: border-box;
+    color: rgba(0, 0, 0, 0.75);
+    display: inline-block;
+    font-size: inherit;
+    height: 40px;
+    line-height: 40px;
+    outline: 0;
+    padding: 0 15px;
+    -webkit-transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+    transition: border-color 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
+    width: 100%;
+    position: relative;
+  }
+  .el-input-group__prepend {
+    width: auto;
+    line-height: 38px;
+    position: absolute;
+    z-index: 3;
+    left: 2px;
+    top: 2px;
+    right: 62px;
+    bottom: 2px;
+    border: 0;
+    background-color: #fff;
+    padding: 0 12px;
+  }
+  .es-iconfont {
+    color: #606266;
+    font-size: 20px;
+  }
+  .el-input__inner {
+    border-radius: 3px !important;
+    color: transparent;
+    padding-right: 60px;
+  }
+  .el-input__suffix {
+    height: auto;
+    top: 50%;
+    transform: translateY(-50%);
+  }
+}
+.es-icon-list {
+  clear: both;
+  overflow: hidden;
+  list-style: none;
+  padding: 0 !important;
+  border: 1px solid #eaeefb;
+  border-radius: 4px;
+  li {
+    float: left;
+    width: 148px;
+    text-align: center;
+    height: 120px;
+    line-height: 120px;
+    color: #666;
+    font-size: 13px;
+    border-right: 1px solid #eee;
+    border-bottom: 1px solid #eee;
+    margin-right: -1px;
+    margin-bottom: -1px;
+    box-sizing: border-box;
+    span {
+      display: inline-block;
+      line-height: normal;
+      vertical-align: middle;
+      font-family: 'Helvetica Neue', Helvetica, 'PingFang SC',
+        'Hiragino Sans GB', 'Microsoft YaHei', SimSun, sans-serif;
+      color: #99a9bf;
+      transition: color 0.15s linear;
+    }
+    i {
+      display: block;
+      font-size: 32px;
+      margin-bottom: 15px;
+      color: #606266;
+      transition: color 0.15s linear;
+    }
+    .icon-name {
+      display: inline-block;
+      padding: 0 3px;
+      height: 1em;
+    }
+    &:hover {
+      i,
+      span {
+        color: #5cb6ff;
+      }
+    }
+  }
+}

package/src/config/api.js

@@ -196,7 +196,7 @@ export const taskUnionSeal = '/bpm/task/taskHandle/taskUnionSeal.dhtml';
 // 报送两办
 export const toTwoOfficesDispatch = '/bpm/bpmBackend/toTwoOfficesDispatch';
 // 报送两办提交
-export const twoOfficesDispatch = 'task/taskHandle/twoOfficesDispatch.dhtml';
+export const twoOfficesDispatch = '/bpm/task/taskHandle/twoOfficesDispatch.dhtml';
 
 // notifySend 消息发送
 export const sendList = '/notify2/notifySendRecord/listJson';

package/src/index.js

@@ -18,6 +18,7 @@ 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 Input from '../packages/input/index.js';
 import InputNumber from '../packages/input-number/index.js';
 import Label from '../packages/label/index.js';
@@ -69,6 +70,7 @@ const components = [
   FlowList,
   HandleUser,
   Handler,
+  Icon,
   Input,
   InputNumber,
   Label,
@@ -113,7 +115,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.21',
+  version: '0.4.23',
   install,
   Button,
   ButtonGroup,
@@ -133,6 +135,7 @@ export default {
   FlowList,
   HandleUser,
   Handler,
+  Icon,
   Input,
   InputNumber,
   Label,