eoss-ui 0.5.83 → 0.5.85

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

@@ -37,6 +37,7 @@
     color: #ffffff;
     text-align: center;
     line-height: 16px;
+    padding-top: 5px;
     margin-bottom: 32px;
   }
   .es-simplicity-user-popover {
@@ -325,16 +326,19 @@
         border-radius: 9px;
       }
       .es-simplicity_apps-text {
-        margin-left: 16px;
-        text-overflow: ellipsis;
-        white-space: nowrap;
-        overflow: hidden;
+        margin-left: 12px;
+        text-align: left;
       }
     }
     .es-simplicity_apps-list-content {
       display: flex;
       align-items: center;
       padding: 16px;
+      .es-simplicity_apps-texts {
+        min-height: 36px;
+        display: flex;
+        align-items: center;
+      }
       .es-simplicity_apps-hover {
         flex-direction: row;
       }
@@ -873,3 +877,167 @@
   opacity: 0;
   z-index: -999;
 }
+
+.es-public-search-box {
+  padding-top: 53px;
+  height: 100%;
+  .es-public-search-input {
+    width: 90%;
+    display: block;
+    margin: 0 auto 20px auto;
+  }
+  .es-public-search-tabs {
+    height: calc(100% - 60px);
+    .el-tabs__header {
+      height: 40px;
+      margin: 0;
+    }
+    .el-tabs__nav-wrap {
+      padding: 0 24px;
+    }
+    .el-tabs__content {
+      height: calc(100% - 40px);
+      padding: 10px 0;
+    }
+    .el-tab-pane {
+      height: 100%;
+      overflow: hidden;
+    }
+  }
+  .es-public-search-content {
+    padding: 10px 20px;
+    position: relative;
+    &::after {
+      content: '';
+      display: block;
+    }
+  }
+  .es-public-search-title {
+    font-size: 16px;
+    line-height: 22px;
+    font-weight: 800;
+    color: #262626;
+    margin-bottom: 23px;
+  }
+  .es-public-search-list-item {
+    padding: 16px 8px 16px 60px;
+    position: relative;
+    cursor: pointer;
+    &:hover {
+      background: rgba(37, 145, 247, 0.08);
+      border-radius: 9px 9px 9px 9px;
+    }
+  }
+  .es-public-search-item-icon {
+    width: 40px;
+    height: 40px;
+    font-size: 14px;
+    position: absolute;
+    left: 8px;
+    top: 50%;
+    margin-top: -20px;
+    border-radius: 6px;
+    color: #fff;
+    text-align: center;
+    line-height: 40px;
+    &.es-public-search-item-icons {
+      font-size: 18px;
+    }
+    &.es-icon-ppt,
+    &.es-icon-pdf {
+      font-size: 40px;
+      color: #ff7878;
+    }
+    &.es-icon-picture,
+    &.es-icon-video,
+    &.es-icon-audioo {
+      font-size: 36px;
+      color: #909399;
+      margin-top: -18px;
+    }
+    &.es-icon-excel {
+      font-size: 40px;
+      color: #199051;
+    }
+    &.es-icon-word {
+      font-size: 40px;
+      color: #1d60f5;
+    }
+    &.es-icon-zip {
+      font-size: 36px;
+      color: #5dc7f7;
+      margin-top: -18px;
+    }
+    &.es-icon-txt {
+      font-size: 40px;
+      color: #909399;
+    }
+    &.es-icon-ios {
+      font-size: 36px;
+      margin-top: -18px;
+    }
+    &.es-icon-android {
+      font-size: 36px;
+      margin-top: -18px;
+      color: #81bd24;
+    }
+    &.es-public-search-item-icon-text {
+      background-color: #2778e5;
+    }
+  }
+  .es-public-search-item-name {
+    font-size: 14px;
+    font-weight: 500;
+    color: #262626;
+    line-height: 22px;
+  }
+  .es-public-search-item-texts {
+    font-size: 12px;
+    font-weight: 400;
+    color: #8c8c8c;
+    line-height: 20px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    .es-public-search-item-text + .es-public-search-item-text {
+      margin-left: 20px;
+    }
+  }
+  .es-public-search-more {
+    text-align: center;
+    color: #8c8c8c;
+    font-weight: 500;
+    font-size: 14px;
+    margin-top: 20px;
+    padding-bottom: 12px;
+    border-bottom: 1px solid #dce3e7;
+    .es-public-search-more-text {
+      cursor: pointer;
+    }
+  }
+  .es-public-search-more-quote {
+    color: #2778e5;
+    padding: 0 4px;
+  }
+  .es-public-search-info {
+    padding: 16px 20px;
+    font-size: 14px;
+    font-weight: 500;
+    color: #262626;
+  }
+  .es-public-search-lists {
+    padding: 0 20px;
+    .es-public-search-list-item {
+      border-bottom: 1px solid #f0f0f0;
+    }
+  }
+  .es-public-search-no-more {
+    text-align: center;
+    padding: 20px;
+  }
+  .es-public-search-scrollbar {
+    .el-scrollbar__view {
+      min-height: 100%;
+    }
+  }
+}

package/packages/upload/src/main.vue

@@ -1,6 +1,6 @@
 <template>
   <el-upload
-    v-if="isRender && url"
+    v-if="isRender && uploadUrl"
     ref="upload"
     v-bind="$attrs"
     class="es-upload"
@@ -8,7 +8,7 @@
     :wait="1000"
     :height="boxHeight"
     :multiple="portrait ? false : multiple"
-    :action="url"
+    :action="uploadUrl"
     :show-file-list="showList"
     :file-list="lists"
     :result-file="resultFile"
@@ -418,7 +418,7 @@ export default {
   },
   data() {
     return {
-      url: this.action,
+      uploadUrl: '',
       lists: [],
       image: '',
       fileAccept: '',
@@ -711,10 +711,12 @@ export default {
           this.fileTotalSize = config.totalSize;
           this.dochubConfig = config.dochubConfig || {};
 
-          let url = this.portrait
-            ? this.dochubConfig.reuploadDocument || uploadOnlyOne
-            : this.dochubConfig.uploadDocument || uploads;
-          this.url = url.indexOf(this.host) > -1 ? url : this.host + url;
+          let url = this.action
+            ? this.action
+            : this.portrait
+            ? this.dochubConfig.reuploadDocumentUrl || uploadOnlyOne
+            : this.dochubConfig.uploadDocumentUrl || uploads;
+          this.uploadUrl = url.indexOf(this.host) > -1 ? url : this.host + url;
         } else {
           util
             .ajax({
@@ -737,10 +739,12 @@ export default {
                       .join(',');
                   }
                   this.dochubConfig = res.results.dochubConfig || {};
-                  let url = this.portrait
-                    ? this.dochubConfig.reuploadDocument || uploadOnlyOne
-                    : this.dochubConfig.uploadDocument || uploads;
-                  this.url =
+                  let url = this.action
+                    ? this.action
+                    : this.portrait
+                    ? this.dochubConfig.reuploadDocumentUrl || uploadOnlyOne
+                    : this.dochubConfig.uploadDocumentUrl || uploads;
+                  this.uploadUrl =
                     url.indexOf(this.host) > -1 ? url : this.host + url;
                   if (res.results.kkViewRootPath) {
                     this.kkfileview = res.results.kkViewRootPath;
@@ -1130,7 +1134,7 @@ export default {
       let url =
         typeof this.downloads === 'string'
           ? this.downloads
-          : this.dochubConfig.compressDownloadDocument || uploadDownloads;
+          : this.dochubConfig.compressDownloadDocumentUrl || uploadDownloads;
       util.win.open(
         this.host +
           url +

package/src/config/api.js

@@ -45,6 +45,9 @@ export const updateUserCustomInfo = '/main2/main/updateUserCustomInfo'; // 更
 export const sysMsgPage = '/main2/notify/sysMsgPage'; // 获取系统消息
 export const ignoreSysMsg = '/main2/notify/ignoreSysMsg'; // 忽略系统消息
 export const ignoreAllSysMsg = '/main2/notify/ignoreAllSysMsg'; // 忽略全部系统消息
+// 框架 - 搜索
+export const searchType = '/oceansearch/v2/search/catalog'; // 搜索分类类型
+
 // 附件相关
 export const getAdjunctProperties =
   '/main2/mecpfileManagement/getAdjunctProperties'; // 获取附件扩展类型大小
@@ -229,4 +232,5 @@ export const sendDelete = '/notify2/notifySendRecord/deleteById';
 export const sendBatch = '/notify2/sendRecord/reSendNotifyMessageBatch';
 
 // 表单结构
-export const formContents = '/config/admin/online/onlineForm/render';
+
+export const formContents = '/lowcode/admin/online/onlineForm/getOnlineFormFromCache';

package/src/index.js

@@ -1,112 +1,112 @@
 /* Automatically generated by './build/bin/build-entry.js' */
 
-import Button from '../packages/button/index.js';
-import ButtonGroup from '../packages/button-group/index.js';
-import Calendar from '../packages/calendar/index.js';
-import Card from '../packages/card/index.js';
-import Cascader from '../packages/cascader/index.js';
-import CheckboxGroup from '../packages/checkbox-group/index.js';
-import Clients from '../packages/clients/index.js';
-import DataTable from '../packages/data-table/index.js';
-import DataTableForm from '../packages/data-table-form/index.js';
-import DatePicker from '../packages/date-picker/index.js';
-import Dialog from '../packages/dialog/index.js';
-import Enterprise from '../packages/enterprise/index.js';
-import ErrorPage from '../packages/error-page/index.js';
-import Form from '../packages/form/index.js';
-import Flow from '../packages/flow/index.js';
-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 Icons from '../packages/icons/index.js';
-import Input from '../packages/input/index.js';
-import InputNumber from '../packages/input-number/index.js';
-import Label from '../packages/label/index.js';
-import Layout from '../packages/layout/index.js';
-import Login from '../packages/login/index.js';
-import Main from '../packages/main/index.js';
-import Menu from '../packages/menu/index.js';
-import Nav from '../packages/nav/index.js';
-import Notify from '../packages/notify/index.js';
-import Pagination from '../packages/pagination/index.js';
-import Page from '../packages/page/index.js';
-import Player from '../packages/player/index.js';
-import QrCode from '../packages/qr-code/index.js';
-import RadioGroup from '../packages/radio-group/index.js';
-import RetrialAuth from '../packages/retrial-auth/index.js';
-import Select from '../packages/select/index.js';
-import SelectGanged from '../packages/select-ganged/index.js';
-import Selector from '../packages/selector/index.js';
-import SelectorPanel from '../packages/selector-panel/index.js';
-import Sizer from '../packages/sizer/index.js';
-import Steps from '../packages/steps/index.js';
-import Switch from '../packages/switch/index.js';
-import Tabs from '../packages/tabs/index.js';
-import TabsPanel from '../packages/tabs-panel/index.js';
-import Tips from '../packages/tips/index.js';
-import Tree from '../packages/tree/index.js';
-import TreeGroup from '../packages/tree-group/index.js';
-import Toolbar from '../packages/toolbar/index.js';
-import TableForm from '../packages/table-form/index.js';
-import Upload from '../packages/upload/index.js';
-import Wujie from '../packages/wujie/index.js';
+import Button from '../packages/button/index.js';
+import ButtonGroup from '../packages/button-group/index.js';
+import Calendar from '../packages/calendar/index.js';
+import Card from '../packages/card/index.js';
+import Cascader from '../packages/cascader/index.js';
+import CheckboxGroup from '../packages/checkbox-group/index.js';
+import Clients from '../packages/clients/index.js';
+import DataTable from '../packages/data-table/index.js';
+import DataTableForm from '../packages/data-table-form/index.js';
+import DatePicker from '../packages/date-picker/index.js';
+import Dialog from '../packages/dialog/index.js';
+import Enterprise from '../packages/enterprise/index.js';
+import ErrorPage from '../packages/error-page/index.js';
+import Form from '../packages/form/index.js';
+import Flow from '../packages/flow/index.js';
+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 Icons from '../packages/icons/index.js';
+import Input from '../packages/input/index.js';
+import InputNumber from '../packages/input-number/index.js';
+import Label from '../packages/label/index.js';
+import Layout from '../packages/layout/index.js';
+import Login from '../packages/login/index.js';
+import Main from '../packages/main/index.js';
+import Menu from '../packages/menu/index.js';
+import Nav from '../packages/nav/index.js';
+import Notify from '../packages/notify/index.js';
+import Pagination from '../packages/pagination/index.js';
+import Page from '../packages/page/index.js';
+import Player from '../packages/player/index.js';
+import QrCode from '../packages/qr-code/index.js';
+import RadioGroup from '../packages/radio-group/index.js';
+import RetrialAuth from '../packages/retrial-auth/index.js';
+import Select from '../packages/select/index.js';
+import SelectGanged from '../packages/select-ganged/index.js';
+import Selector from '../packages/selector/index.js';
+import SelectorPanel from '../packages/selector-panel/index.js';
+import Sizer from '../packages/sizer/index.js';
+import Steps from '../packages/steps/index.js';
+import Switch from '../packages/switch/index.js';
+import Tabs from '../packages/tabs/index.js';
+import TabsPanel from '../packages/tabs-panel/index.js';
+import Tips from '../packages/tips/index.js';
+import Tree from '../packages/tree/index.js';
+import TreeGroup from '../packages/tree-group/index.js';
+import Toolbar from '../packages/toolbar/index.js';
+import TableForm from '../packages/table-form/index.js';
+import Upload from '../packages/upload/index.js';
+import Wujie from '../packages/wujie/index.js';
 import Wxlogin from '../packages/wxlogin/index.js';
 
 const components = [
-  Button,
-  ButtonGroup,
-  Calendar,
-  Card,
-  Cascader,
-  CheckboxGroup,
-  Clients,
-  DataTable,
-  DataTableForm,
-  DatePicker,
-  Dialog,
-  Enterprise,
-  ErrorPage,
-  Form,
-  Flow,
-  FlowGroup,
-  FlowList,
-  HandleUser,
-  Handler,
-  Icon,
-  Icons,
-  Input,
-  InputNumber,
-  Label,
-  Layout,
-  Login,
-  Main,
-  Menu,
-  Nav,
-  Notify,
-  Pagination,
-  Page,
-  Player,
-  QrCode,
-  RadioGroup,
-  RetrialAuth,
-  Select,
-  SelectGanged,
-  Selector,
-  SelectorPanel,
-  Sizer,
-  Steps,
-  Switch,
-  Tabs,
-  TabsPanel,
-  Tips,
-  Tree,
-  TreeGroup,
-  Toolbar,
-  TableForm,
-  Upload,
-  Wujie,
+  Button,
+  ButtonGroup,
+  Calendar,
+  Card,
+  Cascader,
+  CheckboxGroup,
+  Clients,
+  DataTable,
+  DataTableForm,
+  DatePicker,
+  Dialog,
+  Enterprise,
+  ErrorPage,
+  Form,
+  Flow,
+  FlowGroup,
+  FlowList,
+  HandleUser,
+  Handler,
+  Icon,
+  Icons,
+  Input,
+  InputNumber,
+  Label,
+  Layout,
+  Login,
+  Main,
+  Menu,
+  Nav,
+  Notify,
+  Pagination,
+  Page,
+  Player,
+  QrCode,
+  RadioGroup,
+  RetrialAuth,
+  Select,
+  SelectGanged,
+  Selector,
+  SelectorPanel,
+  Sizer,
+  Steps,
+  Switch,
+  Tabs,
+  TabsPanel,
+  Tips,
+  Tree,
+  TreeGroup,
+  Toolbar,
+  TableForm,
+  Upload,
+  Wujie,
   Wxlogin
 ];
 
@@ -121,59 +121,59 @@ if (typeof window !== 'undefined' && window.Vue) {
 }
 
 export default {
-  version: '0.5.83',
+  version: '0.5.85',
   install,
-  Button,
-  ButtonGroup,
-  Calendar,
-  Card,
-  Cascader,
-  CheckboxGroup,
-  Clients,
-  DataTable,
-  DataTableForm,
-  DatePicker,
-  Dialog,
-  Enterprise,
-  ErrorPage,
-  Form,
-  Flow,
-  FlowGroup,
-  FlowList,
-  HandleUser,
-  Handler,
-  Icon,
-  Icons,
-  Input,
-  InputNumber,
-  Label,
-  Layout,
-  Login,
-  Main,
-  Menu,
-  Nav,
-  Notify,
-  Pagination,
-  Page,
-  Player,
-  QrCode,
-  RadioGroup,
-  RetrialAuth,
-  Select,
-  SelectGanged,
-  Selector,
-  SelectorPanel,
-  Sizer,
-  Steps,
-  Switch,
-  Tabs,
-  TabsPanel,
-  Tips,
-  Tree,
-  TreeGroup,
-  Toolbar,
-  TableForm,
-  Upload,
-  Wujie,
+  Button,
+  ButtonGroup,
+  Calendar,
+  Card,
+  Cascader,
+  CheckboxGroup,
+  Clients,
+  DataTable,
+  DataTableForm,
+  DatePicker,
+  Dialog,
+  Enterprise,
+  ErrorPage,
+  Form,
+  Flow,
+  FlowGroup,
+  FlowList,
+  HandleUser,
+  Handler,
+  Icon,
+  Icons,
+  Input,
+  InputNumber,
+  Label,
+  Layout,
+  Login,
+  Main,
+  Menu,
+  Nav,
+  Notify,
+  Pagination,
+  Page,
+  Player,
+  QrCode,
+  RadioGroup,
+  RetrialAuth,
+  Select,
+  SelectGanged,
+  Selector,
+  SelectorPanel,
+  Sizer,
+  Steps,
+  Switch,
+  Tabs,
+  TabsPanel,
+  Tips,
+  Tree,
+  TreeGroup,
+  Toolbar,
+  TableForm,
+  Upload,
+  Wujie,
   Wxlogin
 };

package/src/utils/util.js

@@ -1963,11 +1963,24 @@ const identical = function ({
 const indexOfObj = function (arry, target, key) {
   for (let i = 0; i < arry.length; i++) {
     if (key) {
-      if (typeof target === 'string' && arry[i][key] === target) {
-        return i;
-      }
-      if (target[key] === arry[i][key]) {
-        return i;
+      if (key.indexOf(',') > -1) {
+        let keys = key.split(',');
+        for (let n = 0; n < keys.length; n++) {
+          let k = keys[n];
+          if (typeof target === 'string' && arry[i][k] === target) {
+            return i;
+          }
+          if (target[k] === arry[i][k]) {
+            return i;
+          }
+        }
+      } else {
+        if (typeof target === 'string' && arry[i][key] === target) {
+          return i;
+        }
+        if (target[key] === arry[i][key]) {
+          return i;
+        }
       }
     } else {
       if (JSON.stringify(target) === JSON.stringify(arry[i])) {