1.02

packages/card/src/main.vue

@@ -18,7 +18,7 @@
   </div>
 </template>
 <script>
-import NtLoading from '@/components/thrid/em-element-ui/packages/loading'
+import NtLoading from 'submodule/dx-element-ui/packages/loading'
 export default {
   name: 'NtCard',
   components: { NtLoading },

packages/charts/src/echart.js

@@ -1,5 +1,5 @@
 import echarts from 'echarts';
-import { objectMerge } from '@/components/thrid/em-element-ui/src/tools/utils'
+import { objectMerge } from 'submodule/dx-element-ui/src/tools/utils'
 
 export function formatLegendData(params) {
     let result = '',

packages/charts/src/f2chart.js

@@ -1,5 +1,5 @@
 import { getColorValue } from './chart';
-import { isTypeof, objectMerge } from '@/components/thrid/em-element-ui/src/tools/utils';
+import { isTypeof, objectMerge } from 'submodule/dx-element-ui/src/tools/utils';
 
 export function formatLegendData(params) {
     let result = '',

packages/charts/src/main.vue

@@ -19,7 +19,7 @@
 </template>
 
 <script>
-import NtLoading from "@/components/thrid/em-element-ui/packages/loading"
+import NtLoading from "submodule/dx-element-ui/packages/loading"
 import { NtExtendCharts, F2ExtendCharts, NtMapCharts } from "./index.js";
 
 export default {

packages/charts/src/mapchart.js

@@ -1,5 +1,5 @@
 import echarts from 'echarts';
-import { objectMerge } from '@/components/thrid/em-element-ui/src/tools/utils'
+import { objectMerge } from 'submodule/dx-element-ui/src/tools/utils'
 
 export function formatLegendData(params) {
     let result = '',

packages/form/src/main.vue

@@ -59,11 +59,11 @@
   </el-form>
 </template>
 <script>
-import NtInput from '@/components/thrid/em-element-ui/packages/input';
+import NtInput from 'submodule/dx-element-ui/packages/input';
 import {submitEditFormInfo, otherEvent} from './tool-form';
-import {isTypeof, toolResetPageColumn, arrayToFieldSort} from '@/components/thrid/em-element-ui/src/tools/utils';
-import {addValidatorObj} from '@/components/thrid/em-element-ui/src/tools/validate';
-import { unitInitSelectList } from "@/components/thrid/em-element-ui/packages/list/src/tool-list";
+import {isTypeof, toolResetPageColumn, arrayToFieldSort} from 'submodule/dx-element-ui/src/tools/utils';
+import {addValidatorObj} from 'submodule/dx-element-ui/src/tools/validate';
+import { unitInitSelectList } from "submodule/dx-element-ui/packages/list/src/tool-list";
 
 export default {
   name: 'NtForm',

packages/form/src/tool-form.js

@@ -1,4 +1,4 @@
-import request from '@/components/thrid/em-element-ui/src/tools/request';
+import request from 'submodule/dx-element-ui/src/tools/request';
 import {
     isTypeof,
     utilsTrim,
@@ -7,7 +7,7 @@ import {
     responseKeyToValue,
     mergeRequestParams,
     LOCAL_STORAGE_CURR
-} from '@/components/thrid/em-element-ui/src/tools/utils';
+} from 'submodule/dx-element-ui/src/tools/utils';
 
 //form表单提交数据解释
 export function submitQueryData(_this, paramType = true) {

packages/input/src/main.vue

@@ -565,14 +565,14 @@
 </template>
 <script>
     import NtInput from './main';
-    import NtMap from '@/components/thrid/em-element-ui/packages/map';
-    import NtInputTable from '@/components/thrid/em-element-ui/packages/input-table';
-    import NtUEditor from '@/components/thrid/em-element-ui/packages/ueditor';
-    import NtInputRange from '@/components/thrid/em-element-ui/packages/input-range';
+    import NtMap from 'submodule/dx-element-ui/packages/map';
+    import NtInputTable from 'submodule/dx-element-ui/packages/input-table';
+    import NtUEditor from 'submodule/dx-element-ui/packages/ueditor';
+    import NtInputRange from 'submodule/dx-element-ui/packages/input-range';
 
-import { isTypeof, LOCAL_STORAGE_CURR, downLoadImage, isHttpHeaderURL, datepickerToFormat } from '@/components/thrid/em-element-ui/src/tools/utils';
-    import { loadMore, clickoutside } from '@/components/thrid/em-element-ui/src/tools/directives';
-    import { reloadItemSelectList } from '@/components/thrid/em-element-ui/packages/list/src/tool-list';
+import { isTypeof, LOCAL_STORAGE_CURR, downLoadImage, isHttpHeaderURL, datepickerToFormat } from 'submodule/dx-element-ui/src/tools/utils';
+    import { loadMore, clickoutside } from 'submodule/dx-element-ui/src/tools/directives';
+    import { reloadItemSelectList } from 'submodule/dx-element-ui/packages/list/src/tool-list';
     import {
       initInputData,
       pageBtnClickEvent,

packages/input/src/tool-input.js

@@ -1,5 +1,5 @@
-import request from '@/components/thrid/em-element-ui/src/tools/request';
-import {isTypeof, isJsonString, createUUID, axiosReqParams, responseNodeParseList, responseKeyToValue, responseToResult, isArrayInnerValue, mergeRequestParams} from '@/components/thrid/em-element-ui/src/tools/utils';
+import request from 'submodule/dx-element-ui/src/tools/request';
+import {isTypeof, isJsonString, createUUID, axiosReqParams, responseNodeParseList, responseKeyToValue, responseToResult, isArrayInnerValue, mergeRequestParams} from 'submodule/dx-element-ui/src/tools/utils';
 
 //初始化input值
 export function initInputData(_this) {

packages/list/src/buttons.vue

@@ -1,57 +1,43 @@
 <template>
-    <div>
-        <el-row class="btn-list-border btn-form-inline " v-if="emTableList.showHead"
-            :class="(showHead || tableTitle) ? ' el-btn-row' : ' el-btn-no-row'" :gutter="30">
-            <el-col :span="(emTableList.options && emTableList.options.titleSpan ? emTableList.options.titleSpan : 8)"
-                v-if="tableButtonToAuth(64, 'search')" class="btn-list-left">
-                <span class="title text-overflow-ellipsis" @click.stop="reloadTableList">{{ emTableList.custTableTitle ||
-                    tableTitle}}</span>
-                <span v-if="emTableList.tableStatus" v-html="emTableList.tableStatus"></span>
-                <el-input placeholder="请输入内容" prefix-icon="el-icon-search" v-model="finds">
-                    <el-button @click="searchList()" size="mini" slot="append">查 询</el-button>
-                </el-input>
-            </el-col>
-            <el-col :span="(emTableList.options && emTableList.options.titleSpan ? emTableList.options.titleSpan : 8)"
-                v-else class="btn-list-left">
-                <template v-if="emTableList.leftButtonsList.length">
-                    <el-button v-for="(btn,i) in emTableList.leftButtonsList" size="mini" :type="btn.type" :icon="btn.icon"
-                    @click="eventBtnData(btn.event)">{{btn.name}}</el-button>
-                </template>
-                <span v-else class="title text-overflow-ellipsis"
-                    @click.stop="reloadTableList">{{ emTableList.custTableTitle ||
-                    tableTitle}}</span><span v-if="emTableList.tableStatus" v-html="emTableList.tableStatus"></span>
-            </el-col>
-            <el-col
-                :span="(emTableList.options && emTableList.options.buttonSpan ? emTableList.options.buttonSpan : 16)">
-                <el-button v-for="(btn, index) in tableButtonList()" :key="index"
-                    :size="btn.hasOwnProperty('size') ? btn.size : 'mini'" :type="btn.type ? btn.type : 'primary'"
-                    :icon="btn.icon" :plain="btn.shape === 'plain' ? true : false"
-                    :round="btn.shape === 'round' ? true : false" :circle="btn.shape === 'circle' ? true : false"
-                    :disabled="btn.hasOwnProperty('disabled') ? btn.disabled : false" :style="btn.style"
-                    @click="custBtnList(btn)">{{ btn.name }}</el-button>
-                <el-button v-if="tableButtonToAuth(16, 'add')" size="mini" type="primary" icon="el-icon-plus"
-                    @click="eventBtnData('add')">增加</el-button>
-                <el-button v-if="tableButtonToAuth(32, 'delAll')" size="mini" type="danger" icon="el-icon-delete"
-                    @click="eventBtnData('delAll')">删除</el-button>
-                <el-popover v-if="tableButtonToAuth(2, 'checkbox')" trigger="hover" transition="">
-                    <el-collapse-transition>
-                        <div class="filter-container">
-                            <el-checkbox-group v-model="checkboxVals" open-delay="3">
-                                <el-checkbox v-for="item in columnOptions" :key="item.name" :label="item"
-                                    v-if="item.field != 'oid' && item.field != 'useropts'">{{ item.name }}</el-checkbox>
-                            </el-checkbox-group>
-                        </div>
-                    </el-collapse-transition>
-                    <el-button type="success" slot="reference" size="mini" style="margin-left: 10px;"><i
-                            class="el-icon-date"></i></el-button>
-                </el-popover>
-            </el-col>
-        </el-row>
+    <div class="el-btn-row" flex="main:justify cross:center" v-if="!emTableList.hideBtnRow">
+        <div class="left" flex="cross:center">
+            <template v-if="emTableList.leftButtonsList.length">
+                <el-button v-for="(btn, i) in emTableList.leftButtonsList" size="mini" :type="btn.type" :icon="btn.icon"
+                    @click="eventBtnData(btn.event)">{{ btn.name }}</el-button>
+            </template>
+            <span v-else class="title text-overflow-ellipsis" @click.stop="reloadTableList">{{
+                emTableList.custTableTitle ||
+                tableTitle}}</span>
+                <slot name="extInfo"></slot>
+        </div>
+        <div class="right"><el-button v-for="(btn, index) in tableButtonList()" :key="index"
+                :size="btn.hasOwnProperty('size') ? btn.size : 'mini'" :type="btn.type ? btn.type : 'primary'"
+                :icon="btn.icon" :plain="btn.shape === 'plain' ? true : false"
+                :round="btn.shape === 'round' ? true : false" :circle="btn.shape === 'circle' ? true : false"
+                :disabled="btn.hasOwnProperty('disabled') ? btn.disabled : false" :style="btn.style"
+                @click="custBtnList(btn)">{{ btn.name }}</el-button>
+            <el-button v-if="tableButtonToAuth(16, 'add')" size="mini" type="primary" icon="el-icon-plus"
+                @click="eventBtnData('add')">增加</el-button>
+            <el-button v-if="tableButtonToAuth(32, 'delAll')" size="mini" type="danger" icon="el-icon-delete"
+                @click="eventBtnData('delAll')">删除</el-button>
+            <el-popover v-if="tableButtonToAuth(2, 'checkbox')" trigger="hover" transition="">
+                <el-collapse-transition>
+                    <div class="filter-container">
+                        <el-checkbox-group v-model="checkboxVals" open-delay="3">
+                            <el-checkbox v-for="item in columnOptions" :key="item.name" :label="item"
+                                v-if="item.field != 'oid' && item.field != 'useropts'">{{ item.name }}</el-checkbox>
+                        </el-checkbox-group>
+                    </div>
+                </el-collapse-transition>
+                <el-button type="success" slot="reference" size="mini" style="margin-left: 10px;"><i
+                        class="el-icon-date"></i></el-button>
+            </el-popover>
+        </div>
     </div>
 
 </template>
 <script>
-import { isTypeof, isArrayInnerValue, checkAuthButtonList } from '@/components/thrid/em-element-ui/src/tools/utils';
+import { isTypeof, isArrayInnerValue, checkAuthButtonList } from 'submodule/dx-element-ui/src/tools/utils';
 export default {
     name: 'EmButtons',
     data() {
@@ -141,14 +127,17 @@ export default {
 </script>
 <style rel="stylesheet/scss" lang="scss" scoped>
 .el-btn-row {
-    height: 60px;
-    line-height: 60px;
+    min-height: 60px;
     text-align: right;
 }
-
-.el-btn-no-row {
-    height: 20px;
-    line-height: 20px;
-    text-align: right;
+.left {
+    flex:1;
+    width: 0;
+}
+.title {
+    color: #0084F4;
+    font-size: 14px;
+    cursor: pointer;
+    white-space: nowrap;
 }
-</style>
+</style>

packages/list/src/cardList.vue

@@ -128,9 +128,9 @@
 </template>
 <script>
 import { formatterSelf, formatterDefault, tableListUpdateRowEvent, selectListToValue } from './tool-table';
-import { isTypeof, checkAuthButtonList, isHttpHeaderURL, utilsDeepCopy, objectMerge } from '@/components/thrid/em-element-ui/src/tools/utils';
+import { isTypeof, checkAuthButtonList, isHttpHeaderURL, utilsDeepCopy, objectMerge } from 'submodule/dx-element-ui/src/tools/utils';
 import NtInput from '../../input';
-import bus from '@/components/thrid/em-element-ui/src/tools/eventBus';
+import bus from 'submodule/dx-element-ui/src/tools/eventBus';
 
 export default {
   name: 'NtCardList',

packages/list/src/list.vue

@@ -13,7 +13,7 @@
 <script>
 import EmTables from './tables';
 import NtCardList from './cardList';
-import { isTypeof } from '@/components/thrid/em-element-ui/src/tools/utils';
+import { isTypeof } from 'submodule/dx-element-ui/src/tools/utils';
 
 export default {
   name: 'NtList',

packages/list/src/main.vue

@@ -5,7 +5,9 @@
 
     <div class="container-table-list" :class="{'table-list-only': (page_status&8) != 8, 'table-list-hide': ((page_status&8) != 8 && (page_status&4) != 4)}">
       <!-- button list -->
-      <em-btn-list-pro v-if="tableButtonStatus" :options="btnOptions"></em-btn-list-pro>
+      <em-btn-list-pro v-if="tableButtonStatus" :options="btnOptions">
+        <template slot="extInfo"><slot name="extInfo"/></template>
+      </em-btn-list-pro>
       <!-- 表格 -->
       <nt-list v-if="(page_status&4) == 4" :listType="listType">
         <template v-for="slot in (slots)" v-slot:[slot]="data">
@@ -52,7 +54,7 @@
   import NtForm from '../../form';
   import NtRemoveForm from '../../re-form';
   import {initVueData, utilBtnEventList, unitTableAllEvent, searchSourceData, unitInitDataTableList, unitInitSelectList, reloadItemSelectList} from './tool-list';
-  import { isTypeof } from '@/components/thrid/em-element-ui/src/tools/utils';
+  import { isTypeof } from 'submodule/dx-element-ui/src/tools/utils';
 
   export default {
     name: 'DxTableList',
@@ -311,6 +313,7 @@
       },
       handleSelectionChange(val){
         this.multipleSelection = val;
+        this.$emit('selection-change', val);
       },
       handleSizeChange(val) {
         this.pages.pageSize = val; //修改每页数据量

packages/list/src/tables.vue

@@ -520,9 +520,9 @@ import {
   checkAuthButtonList,
   isHttpHeaderURL,
   nullView
-} from "@/components/thrid/em-element-ui/src/tools/utils";
+} from "submodule/dx-element-ui/src/tools/utils";
 import NtInput from "../../input";
-import bus from "@/components/thrid/em-element-ui/src/tools/eventBus";
+import bus from "submodule/dx-element-ui/src/tools/eventBus";
 
 export default {
   name: "EmTables",

readme.md

@@ -1,5 +1,11 @@
 ## 版本
-1.0.1
+1.02
+  增加功能：
+  1.增加selection-change事件
+  修改文件：
+  list\src\main.vue
+
+1.01
   增加功能：
   1.表格组件增加排序事件sortReloadData；支持设置默认排序列以及正序倒序,page_column:[{sort: 'descending' }]
   2.增加参数showHead，支持隐藏表格组件头部模块 
@@ -27,7 +33,7 @@ npm install em-element-ui -D
 ``` javascript
 import Vue from 'vue'
 import Element from 'element-ui'
-import 'eleme@/components/thrid/em-element-ui/lib/theme-chalk/index.css';
+import 'elemesubmodule/dx-element-ui/lib/theme-chalk/index.css';
 
 Vue.use(Element)
 

src/tools/utils.js

@@ -1,4 +1,4 @@
-import { reloadItemSelectList } from '@/components/thrid/em-element-ui/packages/list/src/tool-list';
+import { reloadItemSelectList } from 'submodule/dx-element-ui/packages/list/src/tool-list';
 
 let Base64 = require('js-base64').Base64;
 

src/tools/validate.js

@@ -2,7 +2,7 @@
  * Created by 王贵旺 on 19/04/08.
  */
 
-import { isJsonString, isTypeof } from '@/components/thrid/em-element-ui/src/tools/utils'
+import { isJsonString, isTypeof } from 'submodule/dx-element-ui/src/tools/utils'
 
 // 验证用户名称
 function validcodeName(rule, value, callback) {