eoss-ui 0.6.27 → 0.6.29

package/lib/login.js

@@ -4026,7 +4026,7 @@ var nightImg = 'data:image/jpeg;base64,/9j/2wCEAAEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBA
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=8b2dac04&
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/login/src/main.vue?vue&type=template&id=2556860e&
 var render = function () {
   var _vm = this
   var _h = _vm.$createElement
@@ -5178,7 +5178,7 @@ var staticRenderFns = [
 render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=8b2dac04&
+// CONCATENATED MODULE: ./packages/login/src/main.vue?vue&type=template&id=2556860e&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(13);
@@ -6568,7 +6568,7 @@ var ceshi = util["a" /* default */].getParams('ceshi');
       return { 'background-image': 'url(' + img + ')' };
     },
     showForget: function showForget() {
-      return this.forget === true && (this.loginModel.indexOf('11') > -1 || this.loginModel.indexOf('6') > -1);
+      return this.forget && typeof this.forget === 'string' ? true : this.forget === true && (this.loginModel.indexOf('11') > -1 || this.loginModel.indexOf('6') > -1);
     }
   },
   watch: {

package/lib/main.js

@@ -11897,8 +11897,8 @@ var simplicity_component = Object(componentNormalizer["a" /* default */])(
 )
 
 /* harmony default export */ var simplicity = (simplicity_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/index.vue?vue&type=template&id=3d6ac16d&
-var defaultvue_type_template_id_3d6ac16d_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/index.vue?vue&type=template&id=ccc0ac68&
+var defaultvue_type_template_id_ccc0ac68_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -12128,15 +12128,23 @@ var defaultvue_type_template_id_3d6ac16d_render = function () {
                               })
                             : _vm.method === "wujie" && _vm.refresh
                             ? [
-                                _c("es-wujie", {
-                                  attrs: {
-                                    show: true,
-                                    props: _vm.wjProps,
-                                    attrs: _vm.wjAttrs,
-                                    name: _vm.wjName,
-                                    url: _vm.page,
-                                  },
-                                }),
+                                _c(
+                                  "es-wujie",
+                                  _vm._b(
+                                    {
+                                      attrs: {
+                                        show: true,
+                                        props: _vm.wjProps,
+                                        attrs: _vm.wjAttrs,
+                                        name: _vm.wjName,
+                                        url: _vm.page,
+                                      },
+                                    },
+                                    "es-wujie",
+                                    _vm.$attrs,
+                                    false
+                                  )
+                                ),
                               ]
                             : _vm.method === "router" && _vm.refresh
                             ? [
@@ -12287,11 +12295,11 @@ var defaultvue_type_template_id_3d6ac16d_render = function () {
     1
   )
 }
-var defaultvue_type_template_id_3d6ac16d_staticRenderFns = []
-defaultvue_type_template_id_3d6ac16d_render._withStripped = true
+var defaultvue_type_template_id_ccc0ac68_staticRenderFns = []
+defaultvue_type_template_id_ccc0ac68_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=3d6ac16d&
+// CONCATENATED MODULE: ./packages/main/src/default/index.vue?vue&type=template&id=ccc0ac68&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/default/userinfo.vue?vue&type=template&id=b6520920&
 var userinfovue_type_template_id_b6520920_render = function () {
@@ -13744,6 +13752,7 @@ var defaultvue_type_script_lang_js_extends = Object.assign || function (target)
 //
 //
 //
+//
 
 
 
@@ -15519,8 +15528,8 @@ var appCode = util["a" /* default */].getParams('appCode') || util["a" /* defaul
 
 var default_component = Object(componentNormalizer["a" /* default */])(
   src_defaultvue_type_script_lang_js_,
-  defaultvue_type_template_id_3d6ac16d_render,
-  defaultvue_type_template_id_3d6ac16d_staticRenderFns,
+  defaultvue_type_template_id_ccc0ac68_render,
+  defaultvue_type_template_id_ccc0ac68_staticRenderFns,
   false,
   null,
   null,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.6.27",
+  "version": "0.6.29",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/flow-list/src/main.vue

@@ -384,16 +384,20 @@ export default {
             showOverflowTooltip: true,
             key: 'blyj',
             render: (h, params) => {
-              return h('span', {}, [
-                params.row.doresult
-                  ? params.row.doresult + (params.row.handleInfo ? '&' : '')
-                  : '',
-                h(
-                  'span',
-                  { style: { color: '#A5A5A5', marginLeft: '2px' } },
-                  params.row.handleInfo || ''
-                )
-              ]);
+              if(params.row.doresult && (params.row.doresult.startsWith('http') || params.row.doresult.startsWith('https'))){
+                return h('img', {attrs:{src: params.row.doresult},style:{width:'100px',height:'100px'}});
+              }else{
+                return h('span', {}, [
+                  params.row.doresult
+                    ? params.row.doresult + (params.row.handleInfo ? '&' : '')
+                    : '',
+                  h(
+                    'span',
+                    { style: { color: '#A5A5A5', marginLeft: '2px' } },
+                    params.row.handleInfo || ''
+                  )
+                ]);
+              }
             }
           },
           {
@@ -547,16 +551,20 @@ export default {
             key: 'blyj',
             showOverflowTooltip: true,
             render: (h, params) => {
-              return h('span', {}, [
-                params.row.doresult
-                  ? params.row.doresult + (params.row.handleInfo ? '&' : '')
-                  : '',
-                h(
-                  'span',
-                  { style: { color: '#A5A5A5', marginLeft: '2px' } },
-                  params.row.handleInfo || ''
-                )
-              ]);
+              if(params.row.doresult && (params.row.doresult.startsWith('http') || params.row.doresult.startsWith('https'))){
+                return h('img', {attrs:{src: params.row.doresult},style:{width:'100px',height:'100px'}});
+              }else{
+                return h('span', {}, [
+                  params.row.doresult
+                    ? params.row.doresult + (params.row.handleInfo ? '&' : '')
+                    : '',
+                  h(
+                    'span',
+                    { style: { color: '#A5A5A5', marginLeft: '2px' } },
+                    params.row.handleInfo || ''
+                  )
+                ]);
+              }
             }
           },
           {

package/packages/login/src/main.vue

@@ -831,11 +831,11 @@ export default {
       return { 'background-image': `url(${img})` };
     },
     showForget() {
-      return (
-        this.forget === true &&
-        (this.loginModel.indexOf('11') > -1 ||
-          this.loginModel.indexOf('6') > -1)
-      );
+      return this.forget && typeof this.forget === 'string'
+        ? true
+        : this.forget === true &&
+            (this.loginModel.indexOf('11') > -1 ||
+              this.loginModel.indexOf('6') > -1);
     }
   },
   watch: {

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

@@ -145,6 +145,7 @@
                 :attrs="wjAttrs"
                 :name="wjName"
                 :url="page"
+                v-bind="$attrs"
               ></es-wujie>
             </template>
             <template v-else-if="method === 'router' && refresh">

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.6.27',
+  version: '0.6.29',
   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
 };