From fee83fc57f553595cc3a4891b8a692fa66cd77fe Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 25 二月 2025 10:43:52 +0800
Subject: [PATCH] 一些更新
---
src/views/tigerprojects/system/lowcode/composition/Config.vue | 283 +++++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 235 insertions(+), 48 deletions(-)
diff --git a/src/views/tigerprojects/system/lowcode/composition/Config.vue b/src/views/tigerprojects/system/lowcode/composition/Config.vue
index 7feddd1..81c100b 100644
--- a/src/views/tigerprojects/system/lowcode/composition/Config.vue
+++ b/src/views/tigerprojects/system/lowcode/composition/Config.vue
@@ -1,44 +1,79 @@
<!--
- * @Description: file content
+ * @Description: 缁勫悎椤甸潰涓殑璁剧疆椤甸潰
* @Author: Ben Lin
* @version:
* @Date: 2024-06-24 23:44:31
* @LastEditors: Ben Lin
- * @LastEditTime: 2024-08-01 19:29:44
+ * @LastEditTime: 2024-10-17 20:28:47
-->
<template>
- <Card :title="GetTitle(props.configType)['configTitle']">
- <BasicForm @register="registerForm">
- <template #[item]="{ field }" v-for="item in GetCrudColSlots()" :key="item">
+ <Card :title="GetTitle(configType)['configTitle']">
+ <BasicForm
+ @register="useForms[d]"
+ @submit="customSubmitFunc"
+ v-for="d in Object.keys(useForms)"
+ :key="d"
+ v-show="d == configType"
+ >
+ <template #[item.name]="{ field }" v-for="item in GetCrudColSlots()" :key="item.name">
<a-button
v-if="field"
class="mt-1 ml-1"
size="small"
- @click="handleSelectItem(item)"
- preIcon="search|svg"
+ @click="SelectItemInForm(item.name)"
+ :preIcon="item.icon"
/>
<GeneralModal
- @register="useModalData[item][0]"
- @success="(d, u) => handleItemSuccess(d, u, item)"
+ @register="useModalData[item.name][0]"
+ @success="(d, u) => SelectInFormSuccess(d, u, item.name)"
/>
+ <GeneralCrudModal @register="useModalsCrudInForm[item.name][0]"></GeneralCrudModal>
</template>
</BasicForm>
</Card>
+ <Card
+ :title="GetTitle(configType, item)['tableTitle']"
+ :bordered="false"
+ v-for="item in OtherTables"
+ :key="item"
+ v-show="showOtherTable[item]"
+ class="mt-1"
+ >
+ <div :style="custTableStyle">
+ <BasicTable @register="useTables[item][0]" v-if="showOtherTable[item]">
+ <template #action="{ record }">
+ <TableAction :actions="createActions(record, item)" />
+ </template>
+ </BasicTable>
+ </div>
+ <normalDrawer @register="useDrawers[item][0]" @success="(d, u) => EditSuccess(d, u, item)" />
+ <GeneralCrudModal @register="useModalsCrud[item][0]"></GeneralCrudModal>
+ </Card>
</template>
<script lang="ts" setup>
- import { Ref, inject, nextTick, onMounted, ref, unref, watch } from 'vue';
- import { BasicForm, FormSchema, useForm } from '/@/components/Form/index';
+ import { Ref, inject, nextTick, onMounted, ref, toRef, toRefs, unref, watch } from 'vue';
+ import { BasicForm } from '/@/components/Form/index';
+ import { BasicTable, TableAction } from '/@/components/Table';
import { Card } from 'ant-design-vue';
import GeneralModal from '/@/views/components/GeneralModal.vue';
+ import GeneralCrudModal from '/@/views/components/GeneralCrudModal.vue';
import { useI18n } from '/@/hooks/web/useI18n';
- import { isNullOrUnDef } from '/@/utils/is';
+ import { isFunction, isNullOrUnDef } from '/@/utils/is';
import { EntityCustFunctionType } from '/@/api/tigerapi/model/basModel';
+ import { editRecord } from '../data';
+ import { useDrawer } from '/@/components/Drawer';
+ import normalDrawer from '../normalDrawer.vue';
+ import { useModal } from '/@/components/Modal';
+ import { useProdRouteStore } from '/@/store/modules/prodRoute';
+ import { storeToRefs } from 'pinia';
const { t } = useI18n();
const emit = defineEmits(['success', 'register']);
const props = defineProps({
configType: { type: String },
});
+ const configType = toRef(props, 'configType');
+ const showOtherTable = ref<any>({}); //鏄剧ず琛ㄦ牸甯冨皵瀵硅薄
const objParams = inject('objParams') as Ref<any>;
const custImport = ref<any[]>([]);
const EntityCustFunction = ref([
@@ -48,6 +83,7 @@
OpenSelectItem(openItemModal: Fn, ...args) {},
GetSelectSuccess(d, u, ...args) {},
GetUseModals() {},
+ GetUseTables(data: Ref<Recordable[]>, ...args) {},
GetTitle(type: string | undefined) {},
nodeChange(params: {
resetFields: any;
@@ -72,45 +108,77 @@
GetTitle,
SubmitFunc,
GetUseModals,
+ GetUseTables,
+ GetUseForm,
+ CustFunc,
+ GetUseCrudModals,
+ ActionItem,
},
] = isNullOrUnDef(custImport.value['default'])
? EntityCustFunction.value
: custImport.value['default']();
-
+ const useProdRoute = useProdRouteStore();
+ const { curDtl } = storeToRefs(useProdRoute);
const useModalData = ref(GetUseModals());
- let formSchema: FormSchema[] = GetCrudForm(props.configType);
- const [registerForm, { resetFields, setFieldsValue, validate, setProps }] = useForm({
- labelWidth: 145,
- schemas: formSchema,
- actionColOptions: {
- offset: 8,
- span: 24,
- },
- wrapperCol: {
- span: 15,
- },
- showActionButtonGroup: true,
- submitButtonOptions: {
- text: '淇濆瓨',
- },
- submitFunc: customSubmitFunc,
+ // const data = ref({});
+ const useTables = ref(GetUseTables(curDtl, emit));
+ const useForms = ref(GetUseForm());
+ const useDrawers = ref({});
+ const useModalsCrud = ref({});
+ const useModalsCrudInForm = ref(GetUseCrudModals());
+ const OtherTables = ref(objParams.value['OtherTableName']);
+ /* 寰幆鑷畾涔夎〃鏍煎悕鍒楄〃锛屽垵濮嬪寲鏄剧ず琛ㄦ牸甯冨皵瀵硅薄 */
+ objParams.value['OtherTableName'].forEach((x) => {
+ showOtherTable.value[x] = false;
+ useDrawers.value[x] = useDrawer();
+ useModalsCrud.value[x] = useModal();
+ });
+ const custTableStyle = ref({
+ height: window.screen.width == 1366 ? '350px' : '450px',
});
/* 娉ㄥ叆閫変腑鑺傜偣鏁版嵁 */
const selectedNodes = inject('selectedNodes') as Ref<any>;
+ const mainRecord = ref(objParams.value.record);
watch(
() => selectedNodes.value,
(newVal, oldVal) => {
nextTick(() => {
- /* 鑺傜偣鍒囨崲浜嬩欢 */
- nodeChange({ resetFields, setFieldsValue, objParams, selectedNodes });
- formSchema = GetCrudForm(selectedNodes.value[0].type);
- setProps({
- schemas: [],
- });
- setProps({
- schemas: formSchema,
- });
+ if (newVal != oldVal) {
+ /* 鑺傜偣鍒囨崲浜嬩欢 */
+ nodeChange({ useForms, objParams, selectedNodes: newVal }).then((result) => {
+ const setProps = useForms.value[newVal[0].type][1].setProps;
+ showOtherTable.value = result.isShow;
+ setProps({
+ schemas: [],
+ });
+ setProps({
+ schemas: GetCrudForm(newVal[0].type),
+ });
+ /* 鏄剧ず鍏朵粬琛ㄦ牸 */
+ const name = result['name'];
+ if (showOtherTable.value[name]) {
+ showOtherTable.value[name] = false;
+ // data.value[name] = curDtl.value[name]; //result[name];
+ // data.value['Action'] = curDtl.value['Action']; //result['Action'];
+ useTables.value = GetUseTables(curDtl, emit);
+ setTimeout(() => {
+ showOtherTable.value[name] = true;
+ }, 10);
+ setTimeout(() => {
+ if (!isNullOrUnDef(name)) {
+ // useTables.value[name][1].setProps({
+ // dataSource: [],
+ // });
+ // useTables.value[name][1].setProps({
+ // dataSource: data.value[name],
+ // });
+ useTables.value[name][1].reload();
+ }
+ }, 1000);
+ }
+ });
+ }
});
},
{ deep: true, immediate: true },
@@ -118,13 +186,34 @@
onMounted(() => {
/* 鑺傜偣鍒囨崲浜嬩欢 */
- nodeChange({ resetFields, setFieldsValue, objParams, selectedNodes });
+ const nodes = selectedNodes.value;
+ nodeChange({ useForms, objParams, selectedNodes: nodes }).then((result) => {
+ showOtherTable.value = result.isShow;
+ // data.value[configType.value as string] = curDtl.value[configType.value as string]; //result[configType.value as string];
+ useTables.value = GetUseTables(curDtl, emit);
+ if (showOtherTable.value[curDtl.value['name']]) {
+ // curDtl.value[result['name']] = curDtl.value[result['name']];
+ // useTables.value[result['name']][1].setProps({
+ // dataSource: [],
+ // });
+ // useTables.value[result['name']][1].setProps({
+ // dataSource: result[result['name']],
+ // });
+ if (!isNullOrUnDef(result['name'])) {
+ useTables.value[result['name']][1].reload();
+ }
+ }
+ });
});
- async function customSubmitFunc() {
+ /**
+ * @description: 鑷畾涔夋彁浜ゆ柟娉�
+ * @param {*} values
+ * @return {*}
+ */
+ async function customSubmitFunc(values) {
try {
- const values = await validate();
- SubmitFunc(values, props.configType, emit);
+ SubmitFunc(values, configType.value, emit);
// values.AUTH_PROD = useUserStore().getUserInfo.prodCode;
// values.FACTORY = useUserStore().getUserInfo.prodCode;
// const apiAction = SaveEntity(values, true, 'MES_PROD_ACTION');
@@ -137,12 +226,90 @@
}
/**
- * @description: 鐐瑰嚮鎵撳紑寮瑰嚭閫夋嫨鍒楄〃妗�
- * @param {*} item
+ * @description: 鐢熸垚鍒楄〃涓搷浣滈」鐨勬寜閽�
+ * @param {*} record
* @return {*}
*/
- function handleSelectItem(item) {
- OpenSelectItem(useModalData.value[item][1].openModal, item);
+ function createActions(record, name) {
+ const params = {
+ record,
+ isUpdate: true,
+ entityName: name,
+ formJson: GetCrudForm(name),
+ ifSave: objParams.value['ifSave'],
+ // cType,
+ // dtlSlots,
+ // formSchemas,
+ // useModalData,
+ // useFormData,
+ crudColSlots: objParams.value['crudColSlots'][name],
+ mainRecord: mainRecord.value,
+ };
+
+ const actionItem = [
+ {
+ icon: 'clarity:note-edit-line',
+ onClick: editRecord.bind(null, useDrawers.value[name][1].openDrawer, params),
+ name: undefined,
+ },
+ ];
+ return ActionItem(
+ params,
+ actionItem,
+ useModalsCrud.value[name][1].openModal,
+ useTables.value[name][1].reload(),
+ objParams.value['CODE'],
+ );
+ }
+
+ /**
+ * @description: 鏂板缂栬緫杩斿洖鎴愬姛鏂规硶
+ * @param {*} d
+ * @param {*} u
+ * @return {*}
+ */
+ function EditSuccess(d, u, item) {
+ if (CustFunc && isFunction(CustFunc)) {
+ CustFunc({
+ ctype: item,
+ values: d,
+ data: curDtl,
+ }).then(() => {
+ /* 鏄剧ず鍏朵粬琛ㄦ牸 */
+ if (showOtherTable.value[item]) {
+ showOtherTable.value[item] = false;
+ setTimeout(() => {
+ showOtherTable.value[item] = true;
+ }, 10);
+ useTables.value = GetUseTables(curDtl, emit);
+ setTimeout(() => {
+ useTables.value[item][1].reload();
+ useForms.value[configType.value as string][1].resetFields();
+ useForms.value[configType.value as string][1].setFieldsValue(
+ curDtl.value[configType.value as string][0],
+ );
+ }, 10);
+ }
+ });
+ }
+ useTables.value[item][1].reload();
+ }
+
+ /**
+ * @description: 鐐瑰嚮鎵撳紑寮瑰嚭閫夋嫨鍒楄〃妗�
+ * @param {*} item slot鍚嶅瓧
+ * @return {*}
+ */
+ function SelectItemInForm(item) {
+ const record = useForms.value[configType.value][1].getFieldsValue();
+ OpenSelectItem(
+ useModalData.value[item][1].openModal,
+ item,
+ useModalsCrudInForm.value[item][1].openModal,
+ record,
+ objParams.value['CODE'],
+ mainRecord.value,
+ );
}
/**
@@ -152,7 +319,27 @@
* @param {*} item
* @return {*}
*/
- function handleItemSuccess(d, u, item) {
- setFieldsValue(GetSelectSuccess(d, u, item));
+ function SelectInFormSuccess(d, u, item) {
+ GetSelectSuccess(d, u, item).then((result) => {
+ useForms.value[configType.value][1].setFieldsValue(result['value']);
+ if (!isNullOrUnDef(curDtl.value[configType.value as string])) {
+ curDtl.value[configType.value as string].map((x) => {
+ Object.getOwnPropertyNames(result['value']).forEach((key) => {
+ x[key] = result['value'][key];
+ });
+ });
+ }
+ showOtherTable.value = result['isShow'];
+ curDtl.value[result.name] = result['data'];
+ /* 閲嶆柊useTable锛屽惁鍒欐暟鎹笉鍒锋柊 */
+ useTables.value = GetUseTables(curDtl, emit);
+ if (showOtherTable.value[result.name]) {
+ showOtherTable.value[result.name] = false;
+ setTimeout(() => {
+ showOtherTable.value[result.name] = true;
+ }, 10);
+ useTables.value[result.name][1].reload();
+ }
+ });
}
</script>
--
Gitblit v1.9.3