From 1094c29e03ee0efc7121babda0532c8138aa801f Mon Sep 17 00:00:00 2001
From: YangYuGang <1378265336@qq.com>
Date: 星期六, 08 三月 2025 20:20:54 +0800
Subject: [PATCH] 收货单、退货单页面添加
---
src/views/tigerprojects/system/lowcode/setting/pageDetail.vue | 732 +++++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 559 insertions(+), 173 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue b/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue
index 07e88dd..8161cf2 100644
--- a/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue
+++ b/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue
@@ -1,3 +1,12 @@
+<!--
+ * @Description: 浣庝唬鐮佺敓鎴愰〉闈�
+ * @Author: Ben Lin
+ * @version:
+ * @Date: 2024-05-30 22:00:44
+ * @LastEditors: Ben Lin
+ * @LastEditTime: 2024-07-30 11:00:14
+-->
+<!-- eslint-disable prettier/prettier -->
<template>
<PageWrapper
class="high-form"
@@ -5,80 +14,14 @@
content="杩欐槸浣庝唬鐮侀〉闈㈢鐞嗭紝鍦ㄨ繖鑳藉鏍规嵁瀹炰綋绫婚厤缃鍒犳敼鍔熻兘椤甸潰銆�"
@back="goBack"
>
- <a-card title="鏌ヨ鏉′欢閰嶇疆" :bordered="false">
- <BasicForm @register="register">
- <template #add="{ field }">
- <a-button
- v-if="field"
- class="mt-1 ml-1"
- size="small"
- @click="handleSelecNew"
- preIcon="search|svg"
- />
- <EntityModal @register="registerNewAdd" @success="handleNewSuccess" />
- </template>
- <template #condAdd="{ field }">
- <a-button
- v-if="field"
- class="mt-1 ml-1"
- size="small"
- @click="condAdd"
- preIcon="add_blue|svg"
- />
- </template>
- <template #subtract="{ field }">
- <a-button
- v-if="field"
- class="mt-1 ml-1"
- size="small"
- @click="del(field)"
- preIcon="subtract|svg"
- />
- </template>
- <template #[item]="{ model, field }" v-for="(item, index) in searchSlots" :key="item">
- <a-input-group compact>
- <ApiSelect
- style="width: 25%"
- :api="getEntityPropertieList"
- :params="{ StartWith: getFieldsValue().ASSEMBLY_NAME, Namespace: 'Tiger.Model' }"
- v-model:value="model[field]"
- resultField="items"
- label-field="DisplayName"
- valueField="Name"
- @change="(value, option) => change(value, option, field)"
- />
- <a-input v-model:value="objInputs[field]" style="width: 55%" />
- <Select
- ref="select"
- v-model:value="searchSelectVals[field]"
- style="width: 20%"
- :options="options"
- :readonly="true"
- @change="(value, option) => searchOnChange(value, option, field)"
- />
- </a-input-group>
- </template>
- <template #[item]="{ model, field }" v-for="item in swSlots" :key="item">
- <a-switch v-model:checked="model[field]" />
- </template>
- <template #[item]="{ model, field }" v-for="item in searchApiSlots" :key="item">
- <a-input v-model:value="model[field]" />
- </template>
- <template #[item]="{ model, field }" v-for="item in searchParamsSlots" :key="item">
- <a-input v-model:value="model[field]" />
- </template>
- <template #[item]="{ model, field }" v-for="item in searchResultFieldSlots" :key="item">
- <a-input v-model:value="model[field]" />
- </template>
- <template #[item]="{ model, field }" v-for="item in searchLabelFieldSlots" :key="item">
- <a-input v-model:value="model[field]" />
- </template>
- <template #[item]="{ model, field }" v-for="item in searchValueFieldSlots" :key="item">
- <a-input v-model:value="model[field]" />
- </template>
- </BasicForm>
- </a-card>
- <a-card title="涓昏〃鏍奸厤缃�" :bordered="false" class="!mt-5">
+ <template #footer>
+ <a-tabs default-active-key="detail" v-model:activeKey="currentKey">
+ <a-tab-pane key="mainKey" tab="涓昏〃鏍奸厤缃�" />
+ <a-tab-pane key="searchKey" tab="鏌ヨ鏉′欢閰嶇疆" />
+ <a-tab-pane key="crudKey" tab="澧炲垹鏀归厤缃�" />
+ </a-tabs>
+ </template>
+ <a-card :bordered="false" v-show="currentKey == 'mainKey'">
<div>
<BasicForm @register="registerMain">
<template #add="{ field }">
@@ -137,12 +80,99 @@
<a-switch v-model:checked="model[field]" />
</template>
<template #[item]="{ model, field }" v-for="item in mainIaSlots" :key="item">
- <a-input v-model:value="model[field]" />
+ <!-- <a-input v-model:value="model[field]" /> -->
+ <CodeEditor v-model:value="model[field]" :mode="modeValue" :bordered="true" />
</template>
</BasicForm>
</div>
</a-card>
- <a-card title="澧炲垹鏀归厤缃�" :bordered="false" class="!mt-5">
+ <a-card :bordered="false" v-show="currentKey == 'searchKey'">
+ <BasicForm @register="register">
+ <template #add="{ field }">
+ <a-button
+ v-if="field"
+ class="mt-1 ml-1"
+ size="small"
+ @click="handleSelecNew"
+ preIcon="search|svg"
+ />
+ <EntityModal @register="registerNewAdd" @success="handleNewSuccess" />
+ </template>
+ <template #condAdd="{ field }">
+ <a-button
+ v-if="field"
+ class="mt-1 ml-1"
+ size="small"
+ @click="condAdd(false)"
+ preIcon="add_blue|svg"
+ />
+ </template>
+ <template #subtract="{ field }">
+ <a-button
+ v-if="field"
+ class="mt-1 ml-1"
+ size="small"
+ @click="del(field)"
+ preIcon="subtract|svg"
+ />
+ </template>
+ <template #[item]="{ model, field }" v-for="(item, index) in searchSlots" :key="item">
+ <a-input-group compact>
+ <ApiSelect
+ v-if="IsSearch == 'Y'"
+ style="width: 25%"
+ :api="getEntityPropertieList"
+ :params="{ StartWith: getFieldsValue().ASSEMBLY_NAME, Namespace: 'Tiger.Model' }"
+ v-model:value="model[field]"
+ resultField="items"
+ label-field="DisplayName"
+ valueField="Name"
+ @change="(value, option) => change(value, option, field)"
+ />
+ <a-input v-if="IsSearch == 'N'" v-model:value="objInputs2[field]" style="width: 25%" />
+ <a-input v-model:value="objInputs[field]" style="width: 55%" />
+ <Select
+ ref="select"
+ v-model:value="searchSelectVals[field]"
+ style="width: 20%"
+ :options="options"
+ :readonly="true"
+ @change="(value, option) => searchOnChange(value, option, field)"
+ />
+ </a-input-group>
+ </template>
+ <template #[item]="{ model, field }" v-for="item in swSlots" :key="item">
+ <a-switch v-model:checked="model[field]" />
+ </template>
+ <template #[item]="{ model, field }" v-for="item in searchApiSlots" :key="item">
+ <a-input v-model:value="model[field]" />
+ </template>
+ <template #[item]="{ model, field }" v-for="item in searchParamsSlots" :key="item">
+ <!-- <a-input v-model:value="model[field]" /> -->
+ <CodeEditor v-model:value="model[field]" :mode="searchModeValue" :bordered="true" />
+ </template>
+ <template #[item]="{ model, field }" v-for="item in searchResultFieldSlots" :key="item">
+ <a-input v-model:value="model[field]" />
+ </template>
+ <template #[item]="{ model, field }" v-for="item in searchLabelFieldSlots" :key="item">
+ <a-input v-model:value="model[field]" />
+ </template>
+ <template #[item]="{ model, field }" v-for="item in searchValueFieldSlots" :key="item">
+ <a-input v-model:value="model[field]" />
+ </template>
+ <template #[item]="{ model, field }" v-for="item in searchOptionsSlots" :key="item">
+ <!-- <a-input v-model:value="model[field]" /> -->
+ <CodeEditor v-model:value="model[field]" :mode="searchModeValue" :bordered="true" />
+ </template>
+ <template #[item]="{ model, field }" v-for="item in searchOnChangeSlots" :key="item">
+ <a-input v-model:value="model[field]" />
+ </template>
+ <template #[item]="{ model, field }" v-for="item in searchPOptionsSlots" :key="item">
+ <a-input v-model:value="model[field]" />
+ </template>
+ </BasicForm>
+ </a-card>
+ <a-card :bordered="false" v-show="currentKey == 'crudKey'">
<BasicForm @register="registerCrud">
<template #add="{ field }">
<a-button
@@ -187,14 +217,21 @@
valueField="Name"
@change="(value, option) => crudChange(value, option, field)"
/>
- <a-input v-model:value="crudInputs[field]" style="width: 55%" />
+ <a-input v-model:value="crudInputs[field]" style="width: 33%" />
<Select
ref="select"
v-model:value="crudSelectVals[field]"
- style="width: 20%"
+ style="width: 21%"
:options="options"
:readonly="true"
@change="(value, option) => componentChange(value, option, field)"
+ />
+ <Select
+ ref="select"
+ v-model:value="crudIsExistVals[field]"
+ style="width: 21%"
+ :options="isExistOptions"
+ :readonly="true"
/>
</a-input-group>
</template>
@@ -208,7 +245,8 @@
<a-input v-model:value="model[field]" />
</template>
<template #[item]="{ model, field }" v-for="item in crudParamsSlots" :key="item">
- <a-input v-model:value="model[field]" />
+ <!-- <a-input v-model:value="model[field]" /> -->
+ <CodeEditor v-model:value="model[field]" :mode="searchModeValue" :bordered="true" />
</template>
<template #[item]="{ model, field }" v-for="item in crudResultFieldSlots" :key="item">
<a-input v-model:value="model[field]" />
@@ -220,9 +258,13 @@
<a-input v-model:value="model[field]" />
</template>
<template #[item]="{ model, field }" v-for="item in crudOptionsSlots" :key="item">
- <a-input v-model:value="model[field]" />
+ <!-- <a-input v-model:value="model[field]" /> -->
+ <CodeEditor v-model:value="model[field]" :mode="searchModeValue" :bordered="true" />
</template>
<template #[item]="{ model, field }" v-for="item in crudOnChangeSlots" :key="item">
+ <a-input v-model:value="model[field]" />
+ </template>
+ <template #[item]="{ model, field }" v-for="item in crudPOptionsSlots" :key="item">
<a-input v-model:value="model[field]" />
</template>
</BasicForm>
@@ -236,7 +278,7 @@
</template>
<script lang="ts" setup>
import { BasicForm, FormSchema, useForm } from '/@/components/Form';
- import { nextTick, onMounted, ref, unref } from 'vue';
+ import { onMounted, ref, unref } from 'vue';
import { Card, InputGroup, Select, Input, Switch } from 'ant-design-vue';
import { ApiSelect } from '/@/components/Form/index';
import { useRoute, useRouter } from 'vue-router';
@@ -245,19 +287,22 @@
import { newFormSchema, crudSchemas, mainSchemas } from './setting.data';
import { useTabs } from '/@/hooks/web/useTabs';
import EntityModal from '/@/views/components/EntityModal.vue';
- import { buildUUID } from '/@/utils/uuid';
import { SelectTypes } from 'ant-design-vue/es/select';
import { useMultipleTabStore } from '/@/store/modules/multipleTab';
import { useModal } from '/@/components/Modal';
import { SaveEntity, getEntity, getEntityPropertieList } from '/@/api/tigerapi/system';
import { EntityPropertie, SYS_LOW_CODE } from '/@/api/tigerapi/model/systemModel';
- import { isNullOrEmpty } from '/@/utils/is';
+ import { isNullOrEmpty, isNullOrUnDef } from '/@/utils/is';
import { useUserStore } from '/@/store/modules/user';
+ import { CodeEditor, MODE } from '/@/components/CodeEditor';
+ import { Tabs } from 'ant-design-vue';
const ACard = Card;
const AInputGroup = InputGroup;
const AInput = Input;
const ASwitch = Switch;
+ const ATabs = Tabs;
+ const currentKey = ref('mainKey');
const route = useRoute();
const go = useGo();
const objParams = ref(JSON.parse(decodeURI(route.params?.id as string)));
@@ -334,6 +379,7 @@
/* 鏌ヨ */
const SearchEntName = ref('');
const objInputs = ref({} as { [key: string]: any });
+ const objInputs2 = ref({} as { [key: string]: any });
const searchProperties = ref([] as EntityPropertie[]);
const searchSlots = ref([] as string[]);
const searchSelectVals = ref({} as { [key: string]: any });
@@ -343,6 +389,11 @@
const searchResultFieldSlots = ref([] as string[]);
const searchLabelFieldSlots = ref([] as string[]);
const searchValueFieldSlots = ref([] as string[]);
+ const searchOptionsSlots = ref([] as string[]);
+ const searchOnChangeSlots = ref([] as string[]);
+ const searchPOptionsSlots = ref([] as string[]);
+ const searchModeValue = ref<MODE>(MODE.JSON);
+ const IsSearch = ref('Y');
/* 涓昏〃 */
const MainEntName = ref('');
const mainSelectVals = ref({} as { [key: string]: any });
@@ -353,11 +404,13 @@
const mainsSwSlots = ref([] as string[]);
const mainwSwSlots = ref([] as string[]);
const mainIaSlots = ref([] as string[]);
+ const modeValue = ref<MODE>(MODE.JAVASCRIPT);
/* 澧炲垹鏀� */
const CrudEntName = ref('');
const crudInputs = ref({} as { [key: string]: any });
const crudProperties = ref([] as EntityPropertie[]);
const crudSelectVals = ref({} as { [key: string]: any });
+ const crudIsExistVals = ref({} as { [key: string]: any });
const crudSlots = ref([] as string[]);
const crudSwSlots = ref([] as string[]);
const crudrSwSlots = ref([] as string[]);
@@ -368,6 +421,7 @@
const crudValueFieldSlots = ref([] as string[]);
const crudOptionsSlots = ref([] as string[]);
const crudOnChangeSlots = ref([] as string[]);
+ const crudPOptionsSlots = ref([] as string[]);
const options = ref<SelectTypes['options']>([
{
@@ -395,6 +449,10 @@
label: 'Checkbox',
},
{
+ value: 'Upload',
+ label: '鏂囦欢涓婁紶',
+ },
+ {
value: 'RangePicker',
label: '鏃堕棿閫夋嫨鍣�',
},
@@ -407,50 +465,97 @@
label: '寮瑰嚭閫夋嫨妗�',
},
]);
+
+ const isExistOptions = ref<SelectTypes['options']>([
+ {
+ value: 'Y',
+ label: '鏄垽鏂瓨鍦�',
+ },
+ {
+ value: 'N',
+ label: '涓嶆槸鍒ゆ柇瀛樺湪',
+ },
+ ]);
+
+ /**
+ * @description: 瀹炰緥缁勪欢鎸傝浇鏃�
+ * @return {*}
+ */
onMounted(() => {
if (unref(objParams.value.Update) == '1') {
getEntity({
sqlcmd: "ID ='" + objParams.value.ID + "'",
entityName: 'SYS_LOW_CODE',
+ order: '',
}).then((data) => {
- var searchForms = JSON.parse(data.Data.Items[0].SEARCH_FORM_JSON);
+ /* 鏌ヨ鍔犺浇 */
+ const searchData = JSON.parse(data.Data.Items[0].SEARCH_FORM_JSON);
+ var searchForms = isNullOrEmpty(searchData.fields) ? searchData : searchData.fields;
SearchEntName.value = data.Data.Items[0].SEARCH_ASSY_NAME;
- setFieldsValue({ ASSEMBLY_NAME: data.Data.Items[0].SEARCH_ASSY_NAME });
+ setFieldsValue({
+ ASSEMBLY_NAME: data.Data.Items[0].SEARCH_ASSY_NAME,
+ IsSearch: searchData.search ? 'Y' : 'N',
+ });
+ IsSearch.value = searchData.search ? 'Y' : 'N';
+ searchForms = searchForms.filter(
+ (item) =>
+ !item['field'].toString().startsWith(SearchEntName.value) &&
+ !item['field'].toString().endsWith('PSelect_0'),
+ );
for (const i in searchForms) {
- if (searchForms[i]['field'] != '0') {
- condAdd();
- if (searchForms[i]['component'] == 'ApiSelect') {
- addApiSelectOption(`${SearchEntName.value}${Number(i) + 1}a`, 'search');
- setFieldsValue({
- [`ApiSelect${SearchEntName.value}${Number(i) + 1}a`]:
- searchForms[i]['componentProps']['api'],
- [`Params${SearchEntName.value}${Number(i) + 1}a`]: JSON.stringify(
- searchForms[i]['componentProps']['params'],
- ),
- [`Result${SearchEntName.value}${Number(i) + 1}a`]:
- searchForms[i]['componentProps']['resultField'],
- [`Label${SearchEntName.value}${Number(i) + 1}a`]:
- searchForms[i]['componentProps']['labelField'],
- [`Value${SearchEntName.value}${Number(i) + 1}a`]:
- searchForms[i]['componentProps']['valueField'],
- });
- }
+ condAdd(true);
+ if (searchForms[i]['component'] == 'ApiSelect') {
+ addApiSelectOption(`${SearchEntName.value}${Number(i) + 1}a`, 'search');
setFieldsValue({
- [`${SearchEntName.value}${Number(i) + 1}a`]: searchForms[i]['field'],
- [`InputNumber${Number(i) + 1}`]: searchForms[i]['colProps'].span,
- [`Switch${Number(i) + 1}`]: searchForms[i]['ifShow'],
+ [`ApiSelect${SearchEntName.value}${Number(i) + 1}a`]:
+ searchForms[i]['componentProps']['api'],
+ [`Params${SearchEntName.value}${Number(i) + 1}a`]: JSON.stringify(
+ searchForms[i]['componentProps']['params'],
+ ),
+ [`Result${SearchEntName.value}${Number(i) + 1}a`]:
+ searchForms[i]['componentProps']['resultField'],
+ [`Label${SearchEntName.value}${Number(i) + 1}a`]:
+ searchForms[i]['componentProps']['labelField'],
+ [`Value${SearchEntName.value}${Number(i) + 1}a`]:
+ searchForms[i]['componentProps']['valueField'],
});
- objInputs.value[`${SearchEntName.value}${Number(i) + 1}a`] = searchForms[i]['label'];
- searchSelectVals.value[`${SearchEntName.value}${Number(i) + 1}a`] = searchForms[i][
- 'comp'
- ]
- ? searchForms[i]['comp']
- : searchForms[i]['component'];
+ }
+ if (searchForms[i]['component'] == 'Select') {
+ addSelectOption(`${SearchEntName.value}${Number(i) + 1}a`, 'search');
+ setFieldsValue({
+ [`XSelect${SearchEntName.value}${Number(i) + 1}a`]: JSON.stringify(
+ searchForms[i]['componentProps']['options'],
+ ),
+ [`XOnChange${SearchEntName.value}${Number(i) + 1}a`]:
+ searchForms[i]['componentProps']['onChange'],
+ });
+ }
+ setFieldsValue({
+ [`${SearchEntName.value}${Number(i) + 1}a`]: searchForms[i]['field'],
+ [`InputNumber${Number(i) + 1}`]: searchForms[i]['colProps'].span,
+ [`Switch${Number(i) + 1}`]: searchForms[i]['ifShow'],
+ });
+ objInputs.value[`${SearchEntName.value}${Number(i) + 1}a`] = searchForms[i]['label'];
+ objInputs2.value[`${SearchEntName.value}${Number(i) + 1}a`] = searchForms[i]['field'];
+ searchSelectVals.value[`${SearchEntName.value}${Number(i) + 1}a`] = searchForms[i]['comp']
+ ? searchForms[i]['comp']
+ : searchForms[i]['component'];
+ if (searchForms[i]['comp']) {
+ addPopSelectOption(`${SearchEntName.value}${Number(i) + 1}a`, 'search');
+ setFieldsValue({
+ [`PSelect${SearchEntName.value}${Number(i) + 1}a`]: searchForms[i]['entityName'],
+ });
}
}
+ /* 澧炲垹鏀瑰姞杞� */
var crudForms = JSON.parse(data.Data.Items[0].FORM_JSON);
CrudEntName.value = data.Data.Items[0].CRUD_ASSY_NAME;
setFieldsValueCrud({ crudAssemblyName: data.Data.Items[0].CRUD_ASSY_NAME });
+ crudForms = crudForms.filter(
+ (item) =>
+ !item['field'].toString().startsWith(CrudEntName.value) &&
+ !item['field'].toString().endsWith('PSelect_0'),
+ );
for (const i in crudForms) {
crudCondAdd();
if (crudForms[i]['component'] == 'ApiSelect') {
@@ -486,11 +591,25 @@
[`rSwitch${Number(i) + 1}`]: crudForms[i]['required'],
});
crudInputs.value[`${CrudEntName.value}${Number(i) + 1}a`] = crudForms[i]['label'];
- crudSelectVals.value[`${CrudEntName.value}${Number(i) + 1}a`] = crudForms[i]['component'];
+ crudSelectVals.value[`${CrudEntName.value}${Number(i) + 1}a`] = crudForms[i]['comp']
+ ? crudForms[i]['comp']
+ : crudForms[i]['component'];
+ if (crudForms[i]['comp']) {
+ addPopSelectOption(`${CrudEntName.value}${Number(i) + 1}a`, 'crud');
+ setFieldsValueCrud({
+ [`PSelect${CrudEntName.value}${Number(i) + 1}a`]: crudForms[i]['entityName'],
+ });
+ }
+ crudIsExistVals.value[`${CrudEntName.value}${Number(i) + 1}a`] = crudForms[i]['isexist'];
}
+ /* 涓昏〃鍔犺浇 */
var objs = JSON.parse(data.Data.Items[0].BASE_FORM_JSON);
MainEntName.value = data.Data.Items[0].ASSEMBLY_NAME;
- setFieldsValueMain({ MainAssemblyName: MainEntName.value });
+ setFieldsValueMain({
+ MainAssemblyName: MainEntName.value,
+ BY_ORG: data.Data.Items[0].BY_ORG,
+ CODE_NAME: data.Data.Items[0].CODE_NAME
+ });
for (const i in objs) {
mainCondAdd();
setFieldsValueMain({
@@ -506,6 +625,10 @@
}
});
+ /**
+ * @description: 鍏ㄩ儴鎻愪氦
+ * @return {*}
+ */
async function submitAll() {
try {
const [values, crudvalues, mainvalues] = await Promise.all([
@@ -516,13 +639,20 @@
/* 鏌ヨ鏉′欢Json */
const Keys = Object.getOwnPropertyNames(values);
- var searchjsons = [];
+ var searchjsons = { search: getFieldsValue().IsSearch == 'Y', fields: [] as any[] };
var _json = {};
var _n = 0;
+ let firstField = '';
for (const k in Keys) {
console.log(`${k}:${Keys[k]}`);
if (Keys[k].toString().startsWith(getFieldsValue().ASSEMBLY_NAME)) {
- _json['field'] = isNullOrEmpty(values[Keys[k]]) ? '' : values[Keys[k]];
+ firstField = Keys[k];
+ _json['field'] =
+ getFieldsValue().IsSearch == 'N'
+ ? objInputs2.value[Keys[k]]
+ : isNullOrEmpty(values[Keys[k]])
+ ? ''
+ : values[Keys[k]];
_json['label'] = objInputs.value[Keys[k]];
_json['defaultValue'] = '';
_json['component'] = searchSelectVals.value[Keys[k]];
@@ -535,6 +665,12 @@
valueField: values[`Value${Keys[k]}`],
};
}
+ if (searchSelectVals.value[Keys[k]] == 'Select') {
+ _json['componentProps'] = {
+ options: JSON.parse(values[`XSelect${Keys[k]}`]),
+ onChange: values[`XOnChange${Keys[k]}`],
+ };
+ }
_n = _n + 4;
}
if (Keys[k].toString().startsWith('InputNumber')) {
@@ -542,7 +678,7 @@
_n++;
}
if (Keys[k].toString().startsWith('Switch')) {
- _json['ifShow'] = isNullOrEmpty(values[Keys[k]]) ? false : (values[Keys[k]] as boolean);
+ _json['ifShow'] = isNullOrUnDef(values[Keys[k]]) ? false : (values[Keys[k]] as boolean);
_n++;
}
if (!isNullOrEmpty(_json) && _n == 6) {
@@ -550,17 +686,18 @@
if (_json['component'] == 'PoPSelect') {
_json['component'] = 'Input';
_json['comp'] = 'PoPSelect';
- searchjsons.push(_json);
+ _json['entityName'] = values[`PSelect${firstField}`];
+ searchjsons.fields.push(_json);
_json = {};
- _json['field'] = '0';
+ _json['field'] = `${firstField}PSelect_0`;
_json['label'] = '1';
- _json['defaultValue'] = '';
+ _json['defaultValue'] = values[`PSelect${firstField}`];
_json['component'] = 'Input';
- _json['colProps'] = { span: 4 };
+ _json['colProps'] = { span: 1 };
_json['ifShow'] = true;
- _json['colSlot'] = 'add';
+ _json['colSlot'] = `${firstField}add`;
}
- searchjsons.push(_json);
+ searchjsons.fields.push(_json);
_json = {};
_n = 0;
}
@@ -568,7 +705,7 @@
console.log(JSON.stringify(searchjsons));
/* 涓昏〃鏍糐son */
const mKeys = Object.getOwnPropertyNames(mainvalues);
- var mjsons = [];
+ var mjsons = [] as any[];
var mjson = {};
var i = 0;
for (const k in mKeys) {
@@ -579,19 +716,19 @@
i = i + 2;
}
if (mKeys[k].toString().startsWith('Switch')) {
- mjson['ifShow'] = isNullOrEmpty(mainvalues[mKeys[k]])
+ mjson['ifShow'] = isNullOrUnDef(mainvalues[mKeys[k]])
? false
: (mainvalues[mKeys[k]] as boolean);
i++;
}
if (mKeys[k].toString().startsWith('sSwitch')) {
- mjson['sorter'] = isNullOrEmpty(mainvalues[mKeys[k]])
+ mjson['sorter'] = isNullOrUnDef(mainvalues[mKeys[k]])
? false
: (mainvalues[mKeys[k]] as boolean);
i++;
}
if (mKeys[k].toString().startsWith('wSwitch')) {
- mjson['resizable'] = isNullOrEmpty(mainvalues[mKeys[k]])
+ mjson['resizable'] = isNullOrUnDef(mainvalues[mKeys[k]])
? false
: (mainvalues[mKeys[k]] as boolean);
i++;
@@ -612,14 +749,17 @@
var cjsons = [];
var cjson = {};
var c = 0;
+ let cfirstField = '';
for (const k in cKeys) {
console.log(`${k}:${cKeys[k]}`);
if (cKeys[k].toString().startsWith(getFieldsValueCrud().crudAssemblyName)) {
+ cfirstField = cKeys[k];
cjson['field'] = isNullOrEmpty(crudvalues[cKeys[k]]) ? '' : crudvalues[cKeys[k]];
cjson['label'] = isNullOrEmpty(crudInputs.value[cKeys[k]])
? ''
: crudInputs.value[cKeys[k]];
cjson['component'] = crudSelectVals.value[cKeys[k]];
+ cjson['isexist'] = crudIsExistVals.value[cKeys[k]];
if (crudSelectVals.value[cKeys[k]] == 'ApiSelect') {
cjson['componentProps'] = {
api: crudvalues[`ApiSelect${cKeys[k]}`],
@@ -638,13 +778,13 @@
c = c + 3;
}
if (cKeys[k].toString().startsWith('Switch')) {
- cjson['show'] = isNullOrEmpty(crudvalues[cKeys[k]])
+ cjson['show'] = isNullOrUnDef(crudvalues[cKeys[k]])
? false
: (crudvalues[cKeys[k]] as boolean);
c++;
}
if (cKeys[k].toString().startsWith('rSwitch')) {
- cjson['required'] = isNullOrEmpty(crudvalues[cKeys[k]])
+ cjson['required'] = isNullOrUnDef(crudvalues[cKeys[k]])
? false
: (crudvalues[cKeys[k]] as boolean);
c++;
@@ -654,13 +794,28 @@
c++;
}
if (!isNullOrEmpty(cjson) && c == 6) {
+ //濡傛灉鏄脊鍑洪�夋嫨妗�
+ if (cjson['component'] == 'PoPSelect') {
+ cjson['component'] = 'Input';
+ cjson['comp'] = 'PoPSelect';
+ cjson['entityName'] = crudvalues[`PSelect${cfirstField}`];
+ cjsons.push(cjson);
+ cjson = {};
+ cjson['field'] = `${cfirstField}PSelect_0`;
+ cjson['label'] = '1';
+ cjson['defaultValue'] = crudvalues[`PSelect${cfirstField}`];
+ cjson['component'] = 'Input';
+ cjson['colProps'] = { span: 4 };
+ cjson['ifShow'] = true;
+ cjson['colSlot'] = `${cfirstField}add`;
+ }
cjsons.push(cjson);
c = 0;
cjson = {};
}
}
console.log(JSON.stringify(cjsons));
- var entity: SYS_LOW_CODE = {
+ var entity = {
ID: objParams.value.ID,
CREATE_USER: useUserStore().getUserInfo.userId as string,
UPDATE_USER: useUserStore().getUserInfo.userId as string,
@@ -670,6 +825,8 @@
ASSEMBLY_NAME: getFieldsValueMain().MainAssemblyName,
CRUD_ASSY_NAME: getFieldsValueCrud().crudAssemblyName,
SEARCH_ASSY_NAME: getFieldsValue().ASSEMBLY_NAME,
+ BY_ORG: getFieldsValueMain().BY_ORG,
+ CODE_NAME: getFieldsValueMain().CODE_NAME,
};
SaveEntity(entity, unref(objParams.value.Update) == '1', 'SYS_LOW_CODE').then((action) => {
if (action.IsSuccessed) {
@@ -691,7 +848,10 @@
}
function handleEdit(record: Recordable) {}
-
+ /**
+ * @description: 鏌ヨ閰嶇疆绫诲悕閫夋嫨鎸夐挳鏂规硶
+ * @return {*}
+ */
function handleSelecNew() {
openNewModal(true, {
data: 'content',
@@ -699,6 +859,10 @@
});
}
+ /**
+ * @description: 涓昏〃閰嶇疆绫诲悕閫夋嫨鎸夐挳鏂规硶
+ * @return {*}
+ */
function mainSelectAssy() {
openMainModal(true, {
data: 'content',
@@ -706,6 +870,10 @@
});
}
+ /**
+ * @description: 澧炲垹鏀归厤缃被鍚嶉�夋嫨鎸夐挳鏂规硶
+ * @return {*}
+ */
function handleSelectCrud() {
openCrudModal(true, {
data: 'content',
@@ -713,41 +881,56 @@
});
}
+ /**
+ * @description: 閫夋嫨绫诲悕寮瑰嚭妗嗚繑鍥炴垚鍔熸柟娉�
+ * @param {*} d
+ * @param {*} u
+ * @return {*}
+ */
async function mainAssySuccess(d, u) {
setFieldsValueMain({
- MainAssemblyName: d.values.values,
+ MainAssemblyName: d.values['val'],
});
var data = await getEntityPropertieList({
- StartWith: d.values.values,
+ StartWith: d.values['val'],
Namespace: 'Tiger.Model',
});
mainProperties.value = data.items;
- MainEntName.value = d.values.values;
+ MainEntName.value = d.values['val'];
}
async function handleNewSuccess(d, u) {
setFieldsValue({
- ASSEMBLY_NAME: d.values.values,
+ ASSEMBLY_NAME: d.values['val'],
});
var data = await getEntityPropertieList({
- StartWith: d.values.values,
+ StartWith: d.values['val'],
Namespace: 'Tiger.Model',
});
searchProperties.value = data.items;
- SearchEntName.value = d.values.values;
+ SearchEntName.value = d.values['val'];
}
async function handleCrudSuccess(d, u) {
setFieldsValueCrud({
- crudAssemblyName: d.values.values,
+ crudAssemblyName: d.values['val'],
});
var data = await getEntityPropertieList({
- StartWith: d.values.values,
+ StartWith: d.values['val'],
Namespace: 'Tiger.Model',
});
crudProperties.value = data.items;
- CrudEntName.value = d.values.values;
+ CrudEntName.value = d.values['val'];
}
+ /* 閫夋嫨绫诲悕寮瑰嚭妗嗚繑鍥炴垚鍔熸柟娉� End */
+
+ /**
+ * @description: 閰嶇疆瀛楁閫夋嫨鏀瑰彉鍚庝簨浠舵柟娉�
+ * @param {*} value
+ * @param {*} option
+ * @param {*} field
+ * @return {*}
+ */
function change(value, option, field) {
console.log(value, option, field);
objInputs.value[field] = option.label;
@@ -760,34 +943,78 @@
console.log(value, option, field);
crudInputs.value[field] = option.label;
}
- /* 鏌ヨ缁勪欢閫夋嫨浜嬩欢 */
+ /* 閰嶇疆瀛楁閫夋嫨鏀瑰彉鍚庝簨浠舵柟娉� End */
+
+ /**
+ * @description: 鏌ヨ缁勪欢閫夋嫨浜嬩欢
+ * @param {*} value
+ * @param {*} option
+ * @param {*} field
+ * @return {*}
+ */
function searchOnChange(value, option, field) {
console.log(value, option, field);
if (value == 'ApiSelect') {
addApiSelectOption(field, 'search');
+ delSelectOption(field, 'search');
+ delPSelectOption(field, 'search');
} else {
delApiSelectOption(field, 'search');
}
- // if (value == 'PoPSelect') {}
+ if (value == 'Select') {
+ addSelectOption(field, 'search');
+ delApiSelectOption(field, 'search');
+ delPSelectOption(field, 'search');
+ } else {
+ delSelectOption(field, 'search');
+ }
+ if (value == 'PoPSelect') {
+ addPopSelectOption(field, 'search');
+ delApiSelectOption(field, 'search');
+ delSelectOption(field, 'search');
+ } else {
+ delPSelectOption(field, 'search');
+ }
}
- /* 澧炲垹鏀圭粍浠堕�夋嫨浜嬩欢 */
+
+ /**
+ * @description: 澧炲垹鏀圭粍浠堕�夋嫨浜嬩欢
+ * @param {*} value
+ * @param {*} option
+ * @param {*} field
+ * @return {*}
+ */
function componentChange(value, option, field) {
console.log(value, option, field);
if (value == 'ApiSelect') {
addApiSelectOption(field, 'crud');
delSelectOption(field, 'crud');
+ delPSelectOption(field, 'crud');
} else {
delApiSelectOption(field, 'crud');
}
if (value == 'Select') {
addSelectOption(field, 'crud');
delApiSelectOption(field, 'crud');
+ delPSelectOption(field, 'crud');
} else {
delSelectOption(field, 'crud');
}
- // if (value == 'PoPSelect') {}
+ if (value == 'PoPSelect') {
+ addPopSelectOption(field, 'crud');
+ delApiSelectOption(field, 'crud');
+ delSelectOption(field, 'crud');
+ } else {
+ delPSelectOption(field, 'crud');
+ }
}
+ /**
+ * @description: 閫夋嫨浜咥piSelect缁勪欢閫夐」鍚庯紝澧炲姞鐩稿簲鐨勮緭鍏ラ」
+ * @param {*} field
+ * @param {*} type
+ * @return {*}
+ */
function addApiSelectOption(field: string, type: string) {
const appendData: FormSchema[] = [
{
@@ -795,35 +1022,35 @@
component: 'Input',
label: `api`,
slot: `Api${field}`,
- colProps: { span: 5 },
+ colProps: { span: 6 },
},
{
field: `Params${field}`,
component: 'Input',
label: 'params',
slot: `Params_${field}`,
- colProps: { span: 6 },
+ colProps: { span: 18 },
},
{
field: `Result${field}`,
component: 'Input',
label: 'resultField',
slot: `ResultField${field}`,
- colProps: { span: 5 },
+ colProps: { span: 8 },
},
{
field: `Label${field}`,
component: 'Input',
label: 'labelField',
slot: `LabelField${field}`,
- colProps: { span: 4 },
+ colProps: { span: 8 },
},
{
field: `Value${field}`,
component: 'Input',
label: 'valueField',
slot: `ValueField${field}`,
- colProps: { span: 4 },
+ colProps: { span: 8 },
},
];
switch (type) {
@@ -838,7 +1065,11 @@
}
}
- /* 澧炲垹鏀笰piSelect鎻掓Ы鏁版嵁娣诲姞 */
+ /**
+ * @description: 澧炲垹鏀笰piSelect鎻掓Ы鏁版嵁娣诲姞
+ * @param {*} field
+ * @return {*}
+ */
function crudSlotsPush(field: string) {
crudApiSlots.value.push(`Api${field}`);
crudParamsSlots.value.push(`Params_${field}`);
@@ -846,7 +1077,12 @@
crudLabelFieldSlots.value.push(`LabelField${field}`);
crudValueFieldSlots.value.push(`ValueField${field}`);
}
- /* 鏌ヨApiSelect鎻掓Ы鏁版嵁娣诲姞 */
+
+ /**
+ * @description: 鏌ヨApiSelect鎻掓Ы鏁版嵁娣诲姞
+ * @param {*} field
+ * @return {*}
+ */
function searchSlotsPush(field: string) {
searchApiSlots.value.push(`Api${field}`);
searchParamsSlots.value.push(`Params_${field}`);
@@ -855,6 +1091,12 @@
searchValueFieldSlots.value.push(`ValueField${field}`);
}
+ /**
+ * @description: 鍙栨秷ApiSelect缁勪欢鍚庡垹闄ゆ坊鍔犵殑杈撳叆椤�
+ * @param {*} field
+ * @param {*} type
+ * @return {*}
+ */
function delApiSelectOption(field: string, type: string) {
const removeData: string[] = [
`ApiSelect${field}`,
@@ -879,7 +1121,11 @@
}
}
- /* 澧炲垹鏀规彃妲藉垹闄ら」 */
+ /**
+ * @description: 澧炲垹鏀规彃妲藉垹闄ら」
+ * @param {*} field
+ * @return {*}
+ */
function crudSlotsSplice(field: string) {
crudApiSlots.value = crudApiSlots.value.filter((item) => item !== `Api${field}`);
crudParamsSlots.value = crudParamsSlots.value.filter((item) => item !== `Params_${field}`);
@@ -893,7 +1139,12 @@
(item) => item !== `ValueField${field}`,
);
}
- /* 澧炲垹鏀规彃妲藉垹闄ら」 */
+
+ /**
+ * @description: 澧炲垹鏀规彃妲藉垹闄ら」
+ * @param {*} field
+ * @return {*}
+ */
function searchSlotsSplice(field: string) {
searchApiSlots.value = searchApiSlots.value.filter((item) => item !== `Api${field}`);
searchParamsSlots.value = searchParamsSlots.value.filter((item) => item !== `Params_${field}`);
@@ -908,6 +1159,10 @@
);
}
+ /**
+ * @description: 涓嬫媺妗哠elect娣诲姞閫夐」
+ * @return {*}
+ */
function addSelectOption(field: string, type: string) {
const appendData: FormSchema[] = [
{
@@ -928,7 +1183,7 @@
switch (type) {
case 'search':
appendSchemaByField(appendData, '');
- // searchSelSlotsPush(field);
+ searchSelSlotsPush(field);
break;
case 'crud':
appendSchemaByFieldCrud(appendData, '');
@@ -937,13 +1192,19 @@
}
}
+ /**
+ * @description: 鍙栨秷Select缁勪欢鍚庡垹闄ゆ坊鍔犵殑杈撳叆椤�
+ * @param {*} field
+ * @param {*} type
+ * @return {*}
+ */
function delSelectOption(field: string, type: string) {
const removeData: string[] = [`XSelect${field}`, `XOnChange${field}`];
switch (type) {
case 'search':
//if (!isNullOrEmpty(getFieldsValue()[`XSelect${field}`])) {
removeSchemaByField(removeData);
- // searchSelSlotsSplice(field);
+ searchSelSlotsSplice(field);
//}
break;
case 'crud':
@@ -955,16 +1216,129 @@
}
}
- /* 澧炲垹鏀筍elect鎻掓Ы鏁版嵁娣诲姞 */
+ /**
+ * @description: 鏌ヨSelect鎻掓Ы鏁版嵁娣诲姞
+ * @param {*} field
+ * @return {*}
+ */
+ function searchSelSlotsPush(field: string) {
+ searchOptionsSlots.value.push(`Select_${field}`);
+ searchOptionsSlots.value.push(`OnChange_${field}`);
+ }
+
+ /**
+ * @description: 鏌ヨ鎻掓Ы鍒犻櫎椤�
+ * @param {*} field
+ * @return {*}
+ */
+ function searchSelSlotsSplice(field: string) {
+ searchOptionsSlots.value = searchOptionsSlots.value.filter(
+ (item) => item !== `Select_${field}`,
+ );
+ searchOptionsSlots.value = searchOptionsSlots.value.filter(
+ (item) => item !== `OnChange_${field}`,
+ );
+ }
+
+ /**
+ * @description: 澧炲垹鏀筍elect鎻掓Ы鏁版嵁娣诲姞
+ * @param {*} field
+ * @return {*}
+ */
function crudSelSlotsPush(field: string) {
crudOptionsSlots.value.push(`Select_${field}`);
crudOnChangeSlots.value.push(`OnChange_${field}`);
}
- /* 澧炲垹鏀规彃妲藉垹闄ら」 */
+ /**
+ * @description: 澧炲垹鏀规彃妲藉垹闄ら」
+ * @return {*}
+ */
function crudSelSlotsSplice(field: string) {
crudOptionsSlots.value = crudOptionsSlots.value.filter((item) => item !== `Select_${field}`);
- crudOnChangeSlots.value = crudOnChangeSlots.value.filter((item) => item !== `Select_${field}`);
+ crudOnChangeSlots.value = crudOnChangeSlots.value.filter(
+ (item) => item !== `OnChange_${field}`,
+ );
+ }
+
+ /**
+ * @description: 寮瑰嚭閫夋嫨妗哖opSelect娣诲姞閫夐」
+ * @param {*} field
+ * @param {*} type
+ * @return {*}
+ */
+ function addPopSelectOption(field: string, type: string) {
+ const appendData: FormSchema[] = [
+ {
+ field: `PSelect${field}`,
+ component: 'Input',
+ label: `defaultValue`,
+ slot: `PSelect_${field}`,
+ colProps: { span: 24 },
+ },
+ ];
+ switch (type) {
+ case 'search':
+ appendSchemaByField(appendData, '');
+ searchPSelSlotsPush(field);
+ break;
+ case 'crud':
+ appendSchemaByFieldCrud(appendData, '');
+ crudPSelSlotsPush(field);
+ break;
+ }
+ }
+
+ /**
+ * @description: 鏌ヨPopSelect鎻掓Ы鏁版嵁娣诲姞
+ * @param {*} field
+ * @return {*}
+ */
+ function searchPSelSlotsPush(field: string) {
+ searchPOptionsSlots.value.push(`PSelect_${field}`);
+ }
+
+ /**
+ * @description: 澧炲垹鏀筆opSelect鎻掓Ы鏁版嵁娣诲姞
+ * @param {*} field
+ * @return {*}
+ */
+ function crudPSelSlotsPush(field: string) {
+ crudPOptionsSlots.value.push(`PSelect_${field}`);
+ }
+
+ function delPSelectOption(field: string, type: string) {
+ const removeData: string[] = [`PSelect${field}`];
+ switch (type) {
+ case 'search':
+ removeSchemaByField(removeData);
+ searchPSelSlotsSplice(field);
+ break;
+ case 'crud':
+ removeSchemaByFieldCrud(removeData);
+ crudPSelSlotsSplice(field);
+ break;
+ }
+ }
+
+ /**
+ * @description: 鏌ヨ鎻掓Ы鍒犻櫎椤�
+ * @param {*} field
+ * @return {*}
+ */
+ function searchPSelSlotsSplice(field: string) {
+ searchPOptionsSlots.value = searchPOptionsSlots.value.filter(
+ (item) => item !== `PSelect_${field}`,
+ );
+ }
+
+ /**
+ * @description: 澧炲垹鏀规彃妲藉垹闄ら」
+ * @param {*} field
+ * @return {*}
+ */
+ function crudPSelSlotsSplice(field: string) {
+ crudPOptionsSlots.value = crudPOptionsSlots.value.filter((item) => item !== `PSelect_${field}`);
}
const n = ref(1);
@@ -972,8 +1346,10 @@
const j = ref(1);
/**
* @description: 鎵归噺娣诲姞 鏌ヨ閰嶇疆
+ * @param {boolean} isMounted - 鏄惁鎸傝浇鏃惰繘鍏ユ柟娉�
*/
- function condAdd() {
+ function condAdd(isMounted: boolean) {
+ IsSearch.value = isMounted ? IsSearch.value : getFieldsValue().IsSearch;
appendSchemaByField(
[
{
@@ -995,14 +1371,14 @@
field: `InputNumber${n.value}`,
component: 'InputNumber',
label: '鍒楀',
- colProps: { span: 3 },
+ colProps: { span: 4 },
},
{
field: `${n.value}`,
component: 'Input',
label: ' ',
slot: 'subtract',
- colProps: { span: 4 },
+ colProps: { span: 3 },
},
],
'',
@@ -1027,9 +1403,15 @@
if (searchSlots.value.length == 0) {
n.value = 1;
}
+ delApiSelectOption(`${SearchEntName.value}${field}a`, 'search');
+ delSelectOption(`${SearchEntName.value}${field}a`, 'search');
+ delPSelectOption(`${SearchEntName.value}${field}a`, 'search');
}
- /* 涓昏〃閰嶇疆 */
+ /**
+ * @description: 涓昏〃閰嶇疆
+ * @return {*}
+ */
function mainCondAdd() {
appendSchemaByFieldMain(
[
@@ -1064,14 +1446,14 @@
},
{
field: `InputTextArea${m.value}`,
- component: 'InputTextArea',
+ component: 'Input',
label: '鑷畾涔夋覆鏌�',
slot: `mainwIa${m.value}`,
colProps: { span: 21 },
- componentProps: {
- placeholder: '璇风紪杈戞覆鏌撲唬鐮�',
- rows: 4,
- },
+ // componentProps: {
+ // placeholder: '璇风紪杈戞覆鏌撲唬鐮�',
+ // rows: 4,
+ // },
},
{
field: `${m.value}`,
@@ -1113,7 +1495,10 @@
}
}
- /* 澧炲垹鏀归厤缃� */
+ /**
+ * @description: 澧炲垹鏀归厤缃�
+ * @return {*}
+ */
function crudCondAdd() {
appendSchemaByFieldCrud(
[
@@ -1123,7 +1508,7 @@
label: '瀛楁' + j.value,
// required: true,
slot: 'crudfac' + j.value,
- colProps: { span: 12 },
+ colProps: { span: 11 },
},
{
field: `Switch${j.value}`,
@@ -1143,7 +1528,7 @@
field: `InputNumber${j.value}`,
component: 'InputNumber',
label: '鍒楀',
- colProps: { span: 3 },
+ colProps: { span: 4 },
},
{
field: `${j.value}`,
@@ -1179,6 +1564,8 @@
j.value = 1;
}
delApiSelectOption(`${CrudEntName.value}${field}a`, 'crud');
+ delSelectOption(`${CrudEntName.value}${field}a`, 'crud');
+ delPSelectOption(`${CrudEntName.value}${field}a`, 'crud');
}
function goBack() {
@@ -1189,6 +1576,5 @@
<style lang="less" scoped>
.high-form {
padding-bottom: 48px;
- }</style
->: { values: any[]; }: any: { values: any[]; }: any: { values: any[]; }: any: any: any: any: any:
-any: any
+ }
+</style>
--
Gitblit v1.9.3