eoss-ui 0.4.22 → 0.4.24

package/packages/form/src/main.vue

@@ -147,10 +147,11 @@
                 :tableAfter="tableAfter"
                 v-bind="items"
                 :thead="thead"
-                :model.sync="models"
                 :readonly="readonly"
                 :contents="items.contents"
                 :widths="widths"
+                :zoom="zoom"
+                :model.sync="models"
                 @click="handleClick"
                 @change="handleChange"
                 @dataChange="handleDataChange"
@@ -1000,6 +1001,7 @@
               :label-width="labelWidth"
               :span="span"
               :widths="widths"
+              :zoom="zoom"
               :model.sync="models"
               @click="handleClick"
               @change="handleChange"
@@ -1901,6 +1903,7 @@
               :model.sync="models"
               :readonly="readonly"
               :contents="items.contents"
+              :zoom="zoom"
               :widths="widths"
               @click="handleClick"
               @change="handleChange"
@@ -2700,12 +2703,13 @@
             :tableAfter="tableAfter"
             v-bind="tableAttrs"
             :thead="thead"
-            :model.sync="models"
             :contents="formContent"
             :readonly="readonly"
             :label-width="labelWidth"
             :span="span"
             :widths="widths"
+            :zoom="zoom"
+            :model.sync="models"
             @click="handleClick"
             @change="handleChange"
             @dataChange="handleDataChange"

package/packages/form/src/table.vue

@@ -1022,7 +1022,8 @@ export default {
     },
     caption: String,
     widths: Array,
-    thead: Array
+    thead: Array,
+    zoom: false
   },
   computed: {
     content() {
@@ -1103,6 +1104,13 @@ export default {
       }
     }
   },
+  watch: {
+    zoom: {
+      handler(val) {
+        this.getWidth();
+      }
+    }
+  },
   data() {
     return {
       col: this.span ? this.span : 2,

package/packages/icon/src/icon.json

@@ -0,0 +1 @@
+["zuomian","monitor","maximize","pointer-up","pointer-left","pointer-down","tri-down","retrograde","rainfall","caveat","print","alarm","table","duigouquan","bumen","mm","accelerate","quanping","password","qing","kaifa","daoru","piaochongicon","instructions","notice","wifi","tishicuo","minganciguanli","switch-off","switch-on","narrow","yidongduan","web","upload","message","go-back","close","shujutongji","folder","edit","enter","dian","wendu","shangwu","shenbao","magnifier","project-add","xiexian","caidan","tupian","home","yinyu","wenhao","template","daiban","set","zhengwen","cuowu","chenggong","indent","increase","ziliaoku","tuichu","quit","leaf","refresh","statistic","gengduo","lvyou","mail","user","zhishi","weizhi","jinggao","zuzhijigou","xue","fenxiang","jinrong","shanchu","jianhao","jiahao","yinzhang","renyuanqiehuan","gouxuanzhong1","circle","fuxuankuang1","fangkuang","application","wenjianjia","jiaren","xiugai","duanxinguanli","workbench","rizhi","gongwen","qingshi","shiwu","official","baogao","document","wodeyouxiang","ziliaojiaohuan","denglu","podium","fangkuai","xuewei","duoyun","pm","xiajia","huanbao","dunpai","shu","gongzuozheng","more","fenlei","delete","fengsu","bar","yuanqu","duomeiti","youjian","qiye","zuixinzixun","biaoge","omit","diaotou","jiantou-left","jiantou-right","jiantou-up","roles","jiantou-next","chijiuhuacunchu","zhuanhuan","cloudy","form","wuye","tri-up","pointer-right","bianji","tri-right","tri-left","daimaguanli","jiankong","kaifazhong","fujian","bingtu","zhuzhuangtu","lose","rmb","move","xiazai","yiban","laoshi","clear","jinyong","yunxing","weihu","chakan","pifu","ren","gouwuche","loading2","yulan","ziliao","yidong","fenxiang11","kaoqin","change","shidu","portfolio","info","yanjing","laba","camera","xitongxiaoxi","xitongguanli","webduan","wagnz","group","shengqian","jiantou-prev","attention","look","guanzhu","daikuan","tubiao","duigou","star","dayin","xinzeng","reduce","goup","calendar","tree","yingyong","caution","zhuanfa","add","zongtiqixian","daochu","gongwu","ihouse","chilun","weixiu","chengguo","trophy","duiwu","qiehuanjiaose","door","shebei","fangjian","microscope","huaxue","shiyanshianquan","shiyan","qiyexinxi","yewuxinxi","lab","shiyanguanli","yuqing","big-screen","signal-search","database","star-mark","cng","professor","informatization","code","science","price","xunhuan","savings","administration","aid","biao","line","xietong","jingzheng","enterprise","datatable","toubiao","bingdu","keji2","qiyeku5","touzi5","zijinliu","zhishichanquan3","kejifuwu2","zhishichanquan2","zijinanquan","kejifuwu1","geju","yiqingfangkong","kejifuwu","anquanfangkong","shujufuwu","shujuceng","shujugongxiang","flows","setup","shujulian","caiwujianguan","caiwuliushui","mubiaogeju","juxing","fuwuqi","touzijigou","xiezilou","jianzhu","logo","touzhi","zijin","fintech","touzixiangmu","library","touziguanli","zhongda","ziyuan","shujutai","shujudongtai","bank","shujuzhongxin","zhongyaomubiao","touzishijian","caiwuguanli","mingzhong","touzishenpi","jingzhenggeju","property","keji","qiyeku","zhongyaojihui","touzilicai","zhishichanquan","touzi","tzz","menu","xiangmushu","pdf","jiazai","gongsi","rise","jbxx","zwxx","jypx","jcgl","ndkh","grjl","shgx","gou","shijian","fukuan","guoji","shoukuan","down","gongzuotai","gaigedongtai","xitongshezhi","relation","zuzhirenshi","kaohepingjia","caiwujiandu","sanzhongyida","mima","xianshi","zhanghao","bangongshi","checked","checke","help","kuoda","banli","xiaoxi","shouqicaidan","shouqicaidan-right","smile","tongzhi","guanji","shuaxin","guiji","tianjiawenjianjia","yunxiazai","del","touzifangan","zongheguanli","sanzhongyida_mian","gongwenguanli1","heguiguanli","jingyingfenxi","txl","diannao","renliziyuan","caiwuxitong","shiwuguanli","shouye","bangongyongpin","sidebar","zhidulashi","log","fawenguanli","huiyiguanli","zuzhishishi","gongwenqianshou","jinxiupeixun","gongwenbao","jiaohuan","daibanshixiang","richeng","tongxunlu","yongche","yanzheng","daibanxinxi","shuben","fanfu","guangbo","shuzhuangtu","bengqiye","tongguo","dengdai","cross","daichuli","zhenggai","shouli","shujuhecha","guanli","paper-file","wenjian","dakaiwenjian","yewu","jiance","jiheguanli","jinru","arrow-right","lingdao","rencai","prev","next","jianpan","qrcode","bohui","homepage","download","gantanhao","dingding","weixin","pad","ios","android","txt","doc","audioo","video","zip","shuru","duanxin","saoma","youxiang","word","excel","fileword","picture","ppt","ca","usb-key"]

package/packages/icon/src/main.vue

@@ -17,11 +17,7 @@
     <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)"
-          >
+          <li v-for="name in list" :key="name" @click.stop="handleSelect(name)">
             <span>
               <i :class="'es-icon-' + name"></i>
               <span class="icon-name">{{ 'es-icon-' + name }}</span>
@@ -33,7 +29,7 @@
   </div>
 </template>
 <script>
-//import util from 'eoss-ui/src/utils/util';
+import icon from './icon.json';
 export default {
   name: 'EsIcon',
   inheritAttrs: false,
@@ -62,6 +58,7 @@ export default {
   },
   data() {
     return {
+      list: icon,
       icon: null,
       visible: false
     };

package/packages/main/src/main.vue

@@ -5,7 +5,7 @@
       class="es-main-header"
       :style="{ backgroundImage: headerImg ? 'url(' + headerImg + ')' : '' }"
     >
-     <AsyncComponent
+      <AsyncComponent
         v-if="themeJSON.logo.comp"
         :style="!themeJSON.topNav.comp ? 'width:100%' : ''"
         :key="themeJSON.logo.comp"
@@ -34,7 +34,7 @@
           "
         ></es-menu>
       </div>
-       <AsyncComponent
+      <AsyncComponent
         v-if="themeJSON.topNav.comp"
         :style="!themeJSON.logo.comp ? 'width:100%' : ''"
         :hide="hide"
@@ -83,7 +83,7 @@
             @click="handleClick"
           ></es-handle-user>
         </div>
-         <AsyncComponent
+        <AsyncComponent
           v-if="themeJSON.leftNav.comp"
           :biserial="biserial"
           :newTitle="showNavTitle ? title : false"
@@ -177,7 +177,7 @@
               /></keep-alive>
             </template>
           </div>
-           <AsyncComponent
+          <AsyncComponent
             style="
               position: absolute;
               height: 60px;
@@ -368,7 +368,7 @@ export default {
       type: Boolean,
       default: true
     },
-    isCustomMain:{
+    isCustomMain: {
       type: Boolean,
       default: false
     }
@@ -617,7 +617,7 @@ export default {
       this.customMenu = res;
       this.setMenu(res);
     },
-        //获取主题模板JSON
+    //获取主题模板JSON
     getMainDetail(id) {
       let params = {
         url: mainDetail,
@@ -664,6 +664,20 @@ export default {
             this.$message.error(err.message);
           }
         });
+    },
+      // 将chalk写入到页面中
+    handleColorToPage(globalThalk) {
+      const thalk = document.getElementById('chalk-style');
+      if (!thalk) {
+        let ele = document.createElement('style');
+        ele.setAttribute('id', 'chalk-style');
+        ele.innerText = globalThalk;
+        document.head.appendChild(ele);
+      }
+      // 如果设置过主题的话
+      else {
+        thalk.innerText = globalThalk;
+      }
     },
     renderMenu() {
       if (this.data !== undefined && this.data.length) {
@@ -796,10 +810,10 @@ export default {
       let mainFrameLayout = results.mainFrameLayout;
       if (results.userStyle.layout && this.isCustomMain) {
         this.getMainDetail(results.userStyle.layout);
-      } else if(this.isCustomMain){
+      } else if (this.isCustomMain) {
         this.getMainDetail(mainFrameLayout);
-      }else{
-        this.showDefault = true
+      } else {
+        this.showDefault = true;
       }
     },
     //获取用户配置及信息
@@ -968,18 +982,18 @@ export default {
         }
         if (this.modal === 'subsystem' || this.modal === 'topside') {
           if (this.modal === 'subsystem') {
-             if (this.menuType === 'custom') {
+            if (this.menuType === 'custom') {
               this.subsystem = this.customMenu;
             } else {
               this.subsystem = res;
             }
           } else if (this.modal === 'topside') {
-             if (this.menuType === 'custom') {
+            if (this.menuType === 'custom') {
               this.navs = this.customMenu;
               this.topActive = res[0].id;
             } else {
               this.navs = res;
-            this.topActive = res[0].id;
+              this.topActive = res[0].id;
             }
           }
           if (this.application) {
@@ -998,12 +1012,12 @@ export default {
             this.active = this.getFirst(this.menu[0]);
           }
         } else if (this.modal === 'topnav') {
-            if (this.menuType === 'custom') {
+          if (this.menuType === 'custom') {
             this.navs = this.customMenu;
             this.topActive = this.getFirst(res[0]);
           } else {
-           this.navs = res;
-          this.topActive = this.getFirst(res[0]);
+            this.navs = res;
+            this.topActive = this.getFirst(res[0]);
           }
         } else {
           this.menu = res;
@@ -1114,14 +1128,13 @@ export default {
         this.modal === 'topSide'
       ) {
         if (this.modal === 'subsystem' || this.modal === 'subSystem') {
-           if (this.menuType === 'custom') {
+          if (this.menuType === 'custom') {
             this.subsystem = this.customMenu;
             this.sysId = active[0];
           } else {
             this.subsystem = res;
-          this.sysId = active[0];
+            this.sysId = active[0];
           }
-          
         } else if (
           this.modal === 'topnav' ||
           this.modal === 'topNav' ||
@@ -1384,6 +1397,7 @@ export default {
     },
     //跳转页面
     handleJump(page, type, res) {
+      console.log(page);
       if (util.win.location.hash === page) {
         this.refresh = true;
         return;

package/packages/select/src/main.vue

@@ -329,6 +329,8 @@ export default {
             if (sysCode) {
               store.set(sysCode, JSON.parse(JSON.stringify(this.options)));
             }
+          } else {
+            this.$message.error(res.msg);
           }
         })
         .catch((err) => {
@@ -474,7 +476,7 @@ export default {
       return '';
     },
     reload() {
-      this.getData(arguments);
+      this.getData(...arguments);
     },
     handleExpand(data, node) {
       if (this.onExpand) {

package/src/index.js

@@ -115,7 +115,7 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.4.22',
+  version: '0.4.24',
   install,
   Button,
   ButtonGroup,