From 08d4018e84039c5a9d400790704fa931afdc861b Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 31 七月 2024 23:18:01 +0800
Subject: [PATCH] 模板变量维护更新

---
 src/views/tigerprojects/system/lowcode/setting/pageDetail.vue |  280 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 152 insertions(+), 128 deletions(-)

diff --git a/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue b/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue
index ba03b94..cddad4b 100644
--- a/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue
+++ b/src/views/tigerprojects/system/lowcode/setting/pageDetail.vue
@@ -4,7 +4,7 @@
  * @version: 
  * @Date: 2024-05-30 22:00:44
  * @LastEditors: Ben Lin
- * @LastEditTime: 2024-07-03 21:58:06
+ * @LastEditTime: 2024-07-30 11:00:14
 -->
 <!-- eslint-disable prettier/prettier -->
 <template>
@@ -74,7 +74,8 @@
           <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]" />
+          <!-- <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]" />
@@ -86,7 +87,8 @@
           <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]" />
+          <!-- <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]" />
@@ -155,7 +157,8 @@
             <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>
@@ -233,7 +236,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]" />
@@ -245,7 +249,8 @@
           <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]" />
@@ -264,7 +269,7 @@
 </template>
 <script lang="ts" setup>
   import { BasicForm, FormSchema, useForm } from '/@/components/Form';
-  import { nextTick, onMounted, ref, unref } from 'vue';
+  import { h, nextTick, 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';
@@ -281,6 +286,7 @@
   import { EntityPropertie, SYS_LOW_CODE } from '/@/api/tigerapi/model/systemModel';
   import { isNullOrEmpty, isNullOrUnDef } from '/@/utils/is';
   import { useUserStore } from '/@/store/modules/user';
+  import { CodeEditor, MODE } from '/@/components/CodeEditor';
 
   const ACard = Card;
   const AInputGroup = InputGroup;
@@ -374,6 +380,7 @@
   const searchOptionsSlots = ref([] as string[]);
   const searchOnChangeSlots = ref([] as string[]);
   const searchPOptionsSlots = ref([] as string[]);
+  const searchModeValue = ref<MODE>(MODE.JSON);
   /* 涓昏〃 */
   const MainEntName = ref('');
   const mainSelectVals = ref({} as { [key: string]: any });
@@ -384,6 +391,7 @@
   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 });
@@ -465,108 +473,123 @@
       getEntity({
         sqlcmd: "ID ='" + objParams.value.ID + "'",
         entityName: 'SYS_LOW_CODE',
-        order: ''
+        order: '',
       }).then((data) => {
         /* 鏌ヨ鍔犺浇 */
         var searchForms = JSON.parse(data.Data.Items[0].SEARCH_FORM_JSON);
         SearchEntName.value = data.Data.Items[0].SEARCH_ASSY_NAME;
         setFieldsValue({ ASSEMBLY_NAME: data.Data.Items[0].SEARCH_ASSY_NAME });
-        searchForms = searchForms.filter((item) => !item['field'].toString().startsWith(SearchEntName.value) && !item['field'].toString().endsWith('PSelect_0'));
+        searchForms = searchForms.filter(
+          (item) =>
+            !item['field'].toString().startsWith(SearchEntName.value) &&
+            !item['field'].toString().endsWith('PSelect_0'),
+        );
         for (const i in searchForms) {
           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'],
-              });
-            }
-            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'],
-              });
-            }
+          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]['comp']){
-              addPopSelectOption(`${SearchEntName.value}${Number(i) + 1}a`, 'search');
-              setFieldsValue({
-                [`PSelect${SearchEntName.value}${Number(i) + 1}a`]: searchForms[i]['entityName'],
-              });
-            }
+          }
+          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'];
+          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'));
+        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') {
-              addApiSelectOption(`${CrudEntName.value}${Number(i) + 1}a`, 'crud');
-              setFieldsValueCrud({
-                [`ApiSelect${CrudEntName.value}${Number(i) + 1}a`]:
-                  crudForms[i]['componentProps']['api'],
-                [`Params${CrudEntName.value}${Number(i) + 1}a`]: JSON.stringify(
-                  crudForms[i]['componentProps']['params'],
-                ),
-                [`Result${CrudEntName.value}${Number(i) + 1}a`]:
-                  crudForms[i]['componentProps']['resultField'],
-                [`Label${CrudEntName.value}${Number(i) + 1}a`]:
-                  crudForms[i]['componentProps']['labelField'],
-                [`Value${CrudEntName.value}${Number(i) + 1}a`]:
-                  crudForms[i]['componentProps']['valueField'],
-              });
-            }
-            if (crudForms[i]['component'] == 'Select') {
-              addSelectOption(`${CrudEntName.value}${Number(i) + 1}a`, 'crud');
-              setFieldsValueCrud({
-                [`XSelect${CrudEntName.value}${Number(i) + 1}a`]: JSON.stringify(
-                  crudForms[i]['componentProps']['options'],
-                ),
-                [`XOnChange${CrudEntName.value}${Number(i) + 1}a`]:
-                  crudForms[i]['componentProps']['onChange'],
-              });
-            }
+          if (crudForms[i]['component'] == 'ApiSelect') {
+            addApiSelectOption(`${CrudEntName.value}${Number(i) + 1}a`, 'crud');
             setFieldsValueCrud({
-              [`${CrudEntName.value}${Number(i) + 1}a`]: crudForms[i]['field'],
-              [`InputNumber${Number(i) + 1}`]: crudForms[i]['colProps'].span,
-              [`Switch${Number(i) + 1}`]: crudForms[i]['show'],
-              [`rSwitch${Number(i) + 1}`]: crudForms[i]['required'],
+              [`ApiSelect${CrudEntName.value}${Number(i) + 1}a`]:
+                crudForms[i]['componentProps']['api'],
+              [`Params${CrudEntName.value}${Number(i) + 1}a`]: JSON.stringify(
+                crudForms[i]['componentProps']['params'],
+              ),
+              [`Result${CrudEntName.value}${Number(i) + 1}a`]:
+                crudForms[i]['componentProps']['resultField'],
+              [`Label${CrudEntName.value}${Number(i) + 1}a`]:
+                crudForms[i]['componentProps']['labelField'],
+              [`Value${CrudEntName.value}${Number(i) + 1}a`]:
+                crudForms[i]['componentProps']['valueField'],
             });
-            crudInputs.value[`${CrudEntName.value}${Number(i) + 1}a`] = crudForms[i]['label'];
-            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'];
+          }
+          if (crudForms[i]['component'] == 'Select') {
+            addSelectOption(`${CrudEntName.value}${Number(i) + 1}a`, 'crud');
+            setFieldsValueCrud({
+              [`XSelect${CrudEntName.value}${Number(i) + 1}a`]: JSON.stringify(
+                crudForms[i]['componentProps']['options'],
+              ),
+              [`XOnChange${CrudEntName.value}${Number(i) + 1}a`]:
+                crudForms[i]['componentProps']['onChange'],
+            });
+          }
+          setFieldsValueCrud({
+            [`${CrudEntName.value}${Number(i) + 1}a`]: crudForms[i]['field'],
+            [`InputNumber${Number(i) + 1}`]: crudForms[i]['colProps'].span,
+            [`Switch${Number(i) + 1}`]: crudForms[i]['show'],
+            [`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]['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,
+        });
         for (const i in objs) {
           mainCondAdd();
           setFieldsValueMain({
@@ -645,7 +668,7 @@
             _json['label'] = '1';
             _json['defaultValue'] = values[`PSelect${firstField}`];
             _json['component'] = 'Input';
-            _json['colProps'] = { span: 4 };
+            _json['colProps'] = { span: 1 };
             _json['ifShow'] = true;
             _json['colSlot'] = `${firstField}add`;
           }
@@ -777,6 +800,7 @@
         ASSEMBLY_NAME: getFieldsValueMain().MainAssemblyName,
         CRUD_ASSY_NAME: getFieldsValueCrud().crudAssemblyName,
         SEARCH_ASSY_NAME: getFieldsValue().ASSEMBLY_NAME,
+        BY_ORG: getFieldsValueMain().BY_ORG,
       };
       SaveEntity(entity, unref(objParams.value.Update) == '1', 'SYS_LOW_CODE').then((action) => {
         if (action.IsSuccessed) {
@@ -801,7 +825,7 @@
   /**
    * @description: 鏌ヨ閰嶇疆绫诲悕閫夋嫨鎸夐挳鏂规硶
    * @return {*}
-   */  
+   */
   function handleSelecNew() {
     openNewModal(true, {
       data: 'content',
@@ -812,7 +836,7 @@
   /**
    * @description: 涓昏〃閰嶇疆绫诲悕閫夋嫨鎸夐挳鏂规硶
    * @return {*}
-   */  
+   */
   function mainSelectAssy() {
     openMainModal(true, {
       data: 'content',
@@ -823,7 +847,7 @@
   /**
    * @description: 澧炲垹鏀归厤缃被鍚嶉�夋嫨鎸夐挳鏂规硶
    * @return {*}
-   */  
+   */
   function handleSelectCrud() {
     openCrudModal(true, {
       data: 'content',
@@ -836,7 +860,7 @@
    * @param {*} d
    * @param {*} u
    * @return {*}
-   */  
+   */
   async function mainAssySuccess(d, u) {
     setFieldsValueMain({
       MainAssemblyName: d.values['val'],
@@ -880,7 +904,7 @@
    * @param {*} option
    * @param {*} field
    * @return {*}
-   */  
+   */
   function change(value, option, field) {
     console.log(value, option, field);
     objInputs.value[field] = option.label;
@@ -901,7 +925,7 @@
    * @param {*} option
    * @param {*} field
    * @return {*}
-   */  
+   */
   function searchOnChange(value, option, field) {
     console.log(value, option, field);
     if (value == 'ApiSelect') {
@@ -926,14 +950,14 @@
       delPSelectOption(field, 'search');
     }
   }
-  
+
   /**
    * @description: 澧炲垹鏀圭粍浠堕�夋嫨浜嬩欢
    * @param {*} value
    * @param {*} option
    * @param {*} field
    * @return {*}
-   */  
+   */
   function componentChange(value, option, field) {
     console.log(value, option, field);
     if (value == 'ApiSelect') {
@@ -964,7 +988,7 @@
    * @param {*} field
    * @param {*} type
    * @return {*}
-   */  
+   */
   function addApiSelectOption(field: string, type: string) {
     const appendData: FormSchema[] = [
       {
@@ -972,35 +996,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) {
@@ -1019,7 +1043,7 @@
    * @description: 澧炲垹鏀笰piSelect鎻掓Ы鏁版嵁娣诲姞
    * @param {*} field
    * @return {*}
-   */  
+   */
   function crudSlotsPush(field: string) {
     crudApiSlots.value.push(`Api${field}`);
     crudParamsSlots.value.push(`Params_${field}`);
@@ -1027,12 +1051,12 @@
     crudLabelFieldSlots.value.push(`LabelField${field}`);
     crudValueFieldSlots.value.push(`ValueField${field}`);
   }
-  
+
   /**
    * @description: 鏌ヨApiSelect鎻掓Ы鏁版嵁娣诲姞
    * @param {*} field
    * @return {*}
-   */  
+   */
   function searchSlotsPush(field: string) {
     searchApiSlots.value.push(`Api${field}`);
     searchParamsSlots.value.push(`Params_${field}`);
@@ -1046,7 +1070,7 @@
    * @param {*} field
    * @param {*} type
    * @return {*}
-   */  
+   */
   function delApiSelectOption(field: string, type: string) {
     const removeData: string[] = [
       `ApiSelect${field}`,
@@ -1075,7 +1099,7 @@
    * @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}`);
@@ -1089,12 +1113,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}`);
@@ -1147,7 +1171,7 @@
    * @param {*} field
    * @param {*} type
    * @return {*}
-   */  
+   */
   function delSelectOption(field: string, type: string) {
     const removeData: string[] = [`XSelect${field}`, `XOnChange${field}`];
     switch (type) {
@@ -1170,7 +1194,7 @@
    * @description: 鏌ヨSelect鎻掓Ы鏁版嵁娣诲姞
    * @param {*} field
    * @return {*}
-   */  
+   */
   function searchSelSlotsPush(field: string) {
     searchOptionsSlots.value.push(`Select_${field}`);
     searchOptionsSlots.value.push(`OnChange_${field}`);
@@ -1180,7 +1204,7 @@
    * @description: 鏌ヨ鎻掓Ы鍒犻櫎椤�
    * @param {*} field
    * @return {*}
-   */  
+   */
   function searchSelSlotsSplice(field: string) {
     searchOptionsSlots.value = searchOptionsSlots.value.filter(
       (item) => item !== `Select_${field}`,
@@ -1194,7 +1218,7 @@
    * @description: 澧炲垹鏀筍elect鎻掓Ы鏁版嵁娣诲姞
    * @param {*} field
    * @return {*}
-   */  
+   */
   function crudSelSlotsPush(field: string) {
     crudOptionsSlots.value.push(`Select_${field}`);
     crudOnChangeSlots.value.push(`OnChange_${field}`);
@@ -1216,7 +1240,7 @@
    * @param {*} field
    * @param {*} type
    * @return {*}
-   */  
+   */
   function addPopSelectOption(field: string, type: string) {
     const appendData: FormSchema[] = [
       {
@@ -1243,7 +1267,7 @@
    * @description: 鏌ヨPopSelect鎻掓Ы鏁版嵁娣诲姞
    * @param {*} field
    * @return {*}
-   */  
+   */
   function searchPSelSlotsPush(field: string) {
     searchPOptionsSlots.value.push(`PSelect_${field}`);
   }
@@ -1252,7 +1276,7 @@
    * @description: 澧炲垹鏀筆opSelect鎻掓Ы鏁版嵁娣诲姞
    * @param {*} field
    * @return {*}
-   */  
+   */
   function crudPSelSlotsPush(field: string) {
     crudPOptionsSlots.value.push(`PSelect_${field}`);
   }
@@ -1275,7 +1299,7 @@
    * @description: 鏌ヨ鎻掓Ы鍒犻櫎椤�
    * @param {*} field
    * @return {*}
-   */  
+   */
   function searchPSelSlotsSplice(field: string) {
     searchPOptionsSlots.value = searchPOptionsSlots.value.filter(
       (item) => item !== `PSelect_${field}`,
@@ -1286,7 +1310,7 @@
    * @description: 澧炲垹鏀规彃妲藉垹闄ら」
    * @param {*} field
    * @return {*}
-   */  
+   */
   function crudPSelSlotsSplice(field: string) {
     crudPOptionsSlots.value = crudPOptionsSlots.value.filter((item) => item !== `PSelect_${field}`);
   }
@@ -1351,15 +1375,15 @@
     if (searchSlots.value.length == 0) {
       n.value = 1;
     }
-    delApiSelectOption(`${CrudEntName.value}${field}a`, 'search');
-    delSelectOption(`${CrudEntName.value}${field}a`, 'search');
-    delPSelectOption(`${CrudEntName.value}${field}a`, 'search');
+    delApiSelectOption(`${SearchEntName.value}${field}a`, 'search');
+    delSelectOption(`${SearchEntName.value}${field}a`, 'search');
+    delPSelectOption(`${SearchEntName.value}${field}a`, 'search');
   }
 
   /**
    * @description: 涓昏〃閰嶇疆
    * @return {*}
-   */  
+   */
   function mainCondAdd() {
     appendSchemaByFieldMain(
       [
@@ -1394,14 +1418,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}`,
@@ -1446,7 +1470,7 @@
   /**
    * @description: 澧炲垹鏀归厤缃�
    * @return {*}
-   */  
+   */
   function crudCondAdd() {
     appendSchemaByFieldCrud(
       [

--
Gitblit v1.9.3