Browse Source

0.4.1

master
许孟阳 5 months ago
parent
commit
62e3a35093
  1. 2
      examples/view/base/table.vue
  2. 2
      package.json
  3. 10
      packages/base/data/list-table.vue
  4. 18
      packages/manage/common/login.vue
  5. 20
      packages/manage/common/login2.vue
  6. 13
      plugs/api/base.ts
  7. 2
      plugs/config/size/large.ts
  8. 1
      plugs/config/size/normal.ts
  9. 1
      plugs/config/size/small.ts
  10. 2
      plugs/i18n/zh.ts

2
examples/view/base/table.vue

@ -6,7 +6,7 @@
<NoobSelect v-model="example.ccc" stateProp="test" :width="120"></NoobSelect> <NoobSelect v-model="example.ccc" stateProp="test" :width="120"></NoobSelect>
</template> </template>
</SearchRow> </SearchRow>
<ListTable :data="data" :props="prop" :page="true"></ListTable> <ListTable :data="data" :props="prop" :page="true" :border="true"></ListTable>
<br /> <br />
<br /> <br />
<Infomation :num="100" title="总数" icon="DataAnalysis"></Infomation> <Infomation :num="100" title="总数" icon="DataAnalysis"></Infomation>

2
package.json

@ -1,6 +1,6 @@
{ {
"name": "noob-mengyxu", "name": "noob-mengyxu",
"version": "0.4.0", "version": "0.4.1",
"main": "index.ts", "main": "index.ts",
"module": "index.ts", "module": "index.ts",
"keywords": [ "keywords": [

10
packages/base/data/list-table.vue

@ -1,7 +1,7 @@
<template> <template>
<div class="my-table"> <div class="my-table">
<el-table ref="table" :size="state.size.size" :data="page ? data.data : data" <el-table ref="table" :size="state.size.size" :data="page ? data.data : data"
@selection-change="selectionChange" @selection-change="selectionChange" :border="border"
:height="height || (page ? state.size.pTableHeight : state.size.tableHeight)" highlight-current-row :height="height || (page ? state.size.pTableHeight : state.size.tableHeight)" highlight-current-row
:row-key="rowKey" :tree-porps="treeProps" :lazy="lazy" :load="load"> :row-key="rowKey" :tree-porps="treeProps" :lazy="lazy" :load="load">
@ -76,6 +76,10 @@ const prop = defineProps({
type: Boolean, type: Boolean,
default: false, default: false,
}, },
border: {
type: Boolean,
default: false,
},
}); });
const emit = defineEmits(["query", "selection-change"]); const emit = defineEmits(["query", "selection-change"]);
@ -194,6 +198,10 @@ onUpdated(() => {
background: v-bind('state.style.tableChildBg') !important; background: v-bind('state.style.tableChildBg') !important;
} }
::v-deep .el-table .el-table__cell {
padding: v-bind('state.size.tablePad') 0px;
}
.my-pagination * { .my-pagination * {
--el-pagination-bg-color: v-bind('state.style.bodyBg') !important; --el-pagination-bg-color: v-bind('state.style.bodyBg') !important;
--el-pagination-disabled-bg-color: v-bind('state.style.bodyBg') !important; --el-pagination-disabled-bg-color: v-bind('state.style.bodyBg') !important;

18
packages/manage/common/login.vue

@ -23,7 +23,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { useStore } from "vuex"; import { useStore } from "vuex";
import { onBeforeMount, onMounted, ref } from "vue"; import { onBeforeMount,onBeforeUnmount, onMounted, ref } from "vue";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import { FormInstance } from "element-plus"; import { FormInstance } from "element-plus";
import { Api, NoobInput, NoobButton, Element } from "noob-mengyxu"; import { Api, NoobInput, NoobButton, Element } from "noob-mengyxu";
@ -68,6 +68,7 @@ const loginConfirm = user => {
commit("initSize"); commit("initSize");
dispatch("getMenus"); dispatch("getMenus");
router.back(); router.back();
document.removeEventListener('keyup', enter_up);
} }
}) })
}; };
@ -81,8 +82,21 @@ const login = () => {
} }
}); });
} }
const enter_up = (e) => {
console.log(e);
onMounted(() => { }); if (e.keyCode == 13 || e.keyCode == 100) {
login();
}
}
onMounted(() => {
document.addEventListener('keyup', enter_up);
});
onBeforeUnmount(() => {
document.removeEventListener('keyup', enter_up);
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.login { .login {

20
packages/manage/common/login2.vue

@ -22,7 +22,7 @@
<script lang="ts" setup> <script lang="ts" setup>
import { useStore } from "vuex"; import { useStore } from "vuex";
import { onBeforeMount, onMounted, ref } from "vue"; import { onBeforeMount, onMounted, ref, onBeforeUnmount } from "vue";
import { useRouter } from "vue-router"; import { useRouter } from "vue-router";
import { FormInstance } from "element-plus"; import { FormInstance } from "element-plus";
import { Api, NoobInput, NoobButton, Element } from "noob-mengyxu"; import { Api, NoobInput, NoobButton, Element } from "noob-mengyxu";
@ -67,6 +67,7 @@ const loginConfirm = user => {
commit("initSize"); commit("initSize");
dispatch("getMenus"); dispatch("getMenus");
router.back(); router.back();
document.removeEventListener('keyup', enter_up);
} }
}) })
}; };
@ -81,7 +82,22 @@ const login = () => {
}); });
} }
onMounted(() => { }); const enter_up = (e) => {
console.log(e);
if (e.keyCode == 13 || e.keyCode == 100) {
login();
}
}
onMounted(() => {
document.addEventListener('keyup', enter_up);
});
onBeforeUnmount(() => {
document.removeEventListener('keyup', enter_up);
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.login { .login {

13
plugs/api/base.ts

@ -36,6 +36,19 @@ export const queryList = (url, example?) => {
}); });
}; };
export const getById = (url, id) => {
return new Promise((resolve, reject) => {
get(url + '/' + id).then(
(rsp: any) => {
resolve(rsp || {});
},
(err) => {
resolve({});
}
);
});
};
export const save = (url, role) => { export const save = (url, role) => {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
post(url, role).then( post(url, role).then(

2
plugs/config/size/large.ts

@ -17,4 +17,6 @@ export default class Small extends Normal {
searchRowHeight = '45px'; //查询行高 searchRowHeight = '45px'; //查询行高
searchRowPad = '12px'; //查询行内间距 searchRowPad = '12px'; //查询行内间距
searchWidth = '190px'; //查询元素默认宽度 searchWidth = '190px'; //查询元素默认宽度
tablePad = '8px';
} }

1
plugs/config/size/normal.ts

@ -26,4 +26,5 @@ export default class Normal {
tableHeight = 0; //表格默认高度 tableHeight = 0; //表格默认高度
pTableHeight = 0; //带分页表格默认高度 pTableHeight = 0; //带分页表格默认高度
pageHeight = 36; //分页插件高度 pageHeight = 36; //分页插件高度
tablePad = '4px';
} }

1
plugs/config/size/small.ts

@ -19,4 +19,5 @@ export default class Small extends Normal {
searchWidth = '150px'; //查询元素默认宽度 searchWidth = '150px'; //查询元素默认宽度
pageHeight = 28; //分页插件高度 pageHeight = 28; //分页插件高度
tablePad = '2px';
} }

2
plugs/i18n/zh.ts

@ -35,7 +35,7 @@ export default class Zh {
noSpace: '密码不能包含空格', noSpace: '密码不能包含空格',
required: '密码至少包含大小写字母和数字', required: '密码至少包含大小写字母和数字',
}; };
styles = ['默认', '明亮', '黑夜', '默认2']; styles = ['', '明亮', '黑夜', ''];
head = { head = {
center: '个人中心', center: '个人中心',

Loading…
Cancel
Save