-
{{ centerText }}
-
{{ bottomText }}
-
+
+
+ {{ centerText }}
+
+
+ {{ bottomText }}
+
+
-
diff --git a/app/src/components/StdDataDisplay/StdTable.vue b/app/src/components/StdDataDisplay/StdTable.vue
deleted file mode 100644
index 7aacda67..00000000
--- a/app/src/components/StdDataDisplay/StdTable.vue
+++ /dev/null
@@ -1,583 +0,0 @@
-
-
-
-
-
-
-
-
- {{ $gettext('Export') }}
-
-
- {{ $gettext('Reset') }}
-
-
- {{ $gettext('Batch Modify') }}
-
-
-
-
-
-
-
-
- {{ text }}
-
-
-
- {{ props.edit_text || $gettext('Modify') }}
-
-
-
-
-
- {{ $gettext('Delete') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/app/src/components/StdDataDisplay/index.ts b/app/src/components/StdDataDisplay/index.ts
deleted file mode 100644
index e69de29b..00000000
diff --git a/app/src/components/StdDataEntry/StdDataEntry.tsx b/app/src/components/StdDataEntry/StdDataEntry.tsx
deleted file mode 100644
index 85ea96a2..00000000
--- a/app/src/components/StdDataEntry/StdDataEntry.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import {defineComponent} from 'vue'
-import {Form} from 'ant-design-vue'
-import StdFormItem from '@/components/StdDataEntry/StdFormItem.vue'
-import './style.less'
-
-export default defineComponent({
- props: ['dataList', 'dataSource', 'error', 'layout'],
- emits: ['update:dataSource'],
- setup(props, {slots}) {
- return () => {
- const template: any = []
- props.dataList.forEach((v: any) => {
- let show = true
- if (v.edit.show) {
- if (typeof v.edit.show === 'boolean') {
- show = v.edit.show
- } else if (typeof v.edit.show === 'function') {
- show = v.edit.show(props.dataSource)
- }
- }
- if (v.edit.type && show) {
- template.push(
-
- {v.edit.type(v.edit, props.dataSource, v.dataIndex)}
-
- )
- }
- })
-
- if (slots.action) {
- template.push(
{slots.action()}
)
- }
-
- return
- }
- }
-})
diff --git a/app/src/components/StdDataEntry/StdFormItem.vue b/app/src/components/StdDataEntry/StdFormItem.vue
deleted file mode 100644
index 9f068f5f..00000000
--- a/app/src/components/StdDataEntry/StdFormItem.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
-
-
diff --git a/app/src/components/StdDataEntry/components/StdSelect.vue b/app/src/components/StdDataEntry/components/StdSelect.vue
deleted file mode 100644
index 37776e88..00000000
--- a/app/src/components/StdDataEntry/components/StdSelect.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/components/StdDataEntry/index.tsx b/app/src/components/StdDataEntry/index.tsx
deleted file mode 100644
index 8dfd62ab..00000000
--- a/app/src/components/StdDataEntry/index.tsx
+++ /dev/null
@@ -1,133 +0,0 @@
-import StdDataEntry from './StdDataEntry.js'
-import {h} from 'vue'
-import {Input, InputNumber, Switch, Textarea} from 'ant-design-vue'
-import StdSelector from './components/StdSelector.vue'
-import StdSelect from './components/StdSelect.vue'
-import StdPassword from './components/StdPassword.vue'
-
-interface IEdit {
- type: Function
- placeholder: any
- mask: any
- key: any
- value: any
- recordValueIndex: any
- selectionType: any
- api: Object,
- columns: any,
- data_key: any,
- disable_search: boolean,
- get_params: Object,
- description: string
- generate: boolean
- min: number
- max: number,
- extra: string
-}
-
-function fn(obj: Object, desc: any) {
- let arr: string[]
- if (typeof desc === 'string') {
- arr = desc.split('.')
- } else {
- arr = [...desc]
- }
-
- while (arr.length) {
- // @ts-ignore
- const top = obj[arr.shift()]
- if (top === undefined) {
- return null
- }
- obj = top
- }
- return obj
-}
-
-function readonly(edit: IEdit, dataSource: any, dataIndex: any) {
- return h('p', fn(dataSource, dataIndex))
-}
-
-function input(edit: IEdit, dataSource: any, dataIndex: any) {
- return h(Input, {
- placeholder: edit.placeholder?.() ?? '',
- value: dataSource?.[dataIndex],
- 'onUpdate:value': value => {
- dataSource[dataIndex] = value
- }
- })
-}
-
-function inputNumber(edit: IEdit, dataSource: any, dataIndex: any) {
- return h(InputNumber, {
- placeholder: edit.placeholder?.() ?? '',
- min: edit.min,
- max: edit.max,
- value: dataSource?.[dataIndex],
- 'onUpdate:value': value => {
- dataSource[dataIndex] = value
- }
- })
-}
-
-function textarea(edit: IEdit, dataSource: any, dataIndex: any) {
- return h(Textarea, {
- placeholder: edit.placeholder?.() ?? '',
- value: dataSource?.[dataIndex],
- 'onUpdate:value': value => {
- dataSource[dataIndex] = value
- }
- })
-}
-
-function password(edit: IEdit, dataSource: any, dataIndex: any) {
- return
-}
-
-function select(edit: IEdit, dataSource: any, dataIndex: any) {
- return
-}
-
-function selector(edit: IEdit, dataSource: any, dataIndex: any) {
- return
-}
-
-function antSwitch(edit: IEdit, dataSource: any, dataIndex: any) {
- return h(Switch, {
- checked: dataSource?.[dataIndex],
- 'onUpdate:checked': (value: any) => {
- dataSource[dataIndex] = value
- }
- })
-}
-
-export {
- readonly,
- input,
- textarea,
- select,
- selector,
- password,
- inputNumber,
- antSwitch
-}
-
-export default StdDataEntry
diff --git a/app/src/components/StdDataDisplay/StdBatchEdit.vue b/app/src/components/StdDesign/StdDataDisplay/StdBatchEdit.vue
similarity index 69%
rename from app/src/components/StdDataDisplay/StdBatchEdit.vue
rename to app/src/components/StdDesign/StdDataDisplay/StdBatchEdit.vue
index 25d0f914..57d9faaa 100644
--- a/app/src/components/StdDataDisplay/StdBatchEdit.vue
+++ b/app/src/components/StdDesign/StdDataDisplay/StdBatchEdit.vue
@@ -1,21 +1,24 @@
-
-
-
-
-
+
+
diff --git a/app/src/components/StdDataDisplay/StdPagination.vue b/app/src/components/StdDesign/StdDataDisplay/StdPagination.vue
similarity index 66%
rename from app/src/components/StdDataDisplay/StdPagination.vue
rename to app/src/components/StdDesign/StdDataDisplay/StdPagination.vue
index 3fbc3e95..1851ffc6 100644
--- a/app/src/components/StdDataDisplay/StdPagination.vue
+++ b/app/src/components/StdDesign/StdDataDisplay/StdPagination.vue
@@ -1,10 +1,13 @@
-