Merge branch 'main' of http://123.132.248.154:10000/HC_YFZX/CaiYuanYiTiHua

.env.production

@@ -12,9 +12,9 @@ VITE_BUILD_COMPRESS = 'none'
 
 # Basic interface address SPA
 #财源
-VITE_GLOB_API_URL=http://192.168.10.102:9500
+#VITE_GLOB_API_URL=http://192.168.10.102:9500
 #基础框架
-#VITE_GLOB_API_URL=http://192.168.10.102:9023
+VITE_GLOB_API_URL=http://192.168.10.102:9023
 
 # File upload address， optional
 # It can be forwarded by nginx or write the actual address directly

src/components/FormViewer/index.vue

@@ -227,7 +227,9 @@
         console.log(props.flowFormData);
         if (!disDetail) {
           console.log('赋值赋值');
-          setFieldsValue(props.flowFormData);
+          if (props.flowFormData) {
+            setFieldsValue(props.flowFormData);
+          }
         }
       }, 10);
       scrollValue.value = { x: (subTableColumns.value.length - 1) * 140, y: 400 };
@@ -295,29 +297,18 @@
   }
   async function getForm() {
     try {
-      console.log(getFieldsValue());
       const values = await validate();
-      console.log(values);
-      console.log(FieldsValue.value);
       for (const key in values) {
         for (const fieKey in FieldsValue.value) {
           if (key == fieKey) {
             if (values[key] != undefined) {
-              FieldsValue.value[key] = values[key];
+              values[key] = FieldsValue.value[key];
             }
           }
         }
       }
-      console.log(values);
-      console.log(FieldsValue.value);
       let saveSubTableList = [];
-      let query;
-      console.log(Object.keys(FieldsValue.value).length);
-      if (Object.keys(FieldsValue.value).length == 0) {
-        query = values;
-      } else {
-        query = FieldsValue.value;
-      }
+      let query = values;
       console.log(query);
       subTableList.value.forEach((item) => {
         let emptyObj = {};

src/components/ProcessDesigner/package/penal/userTask/src/executeSQL.vue

@@ -9,7 +9,7 @@
       :wrapper-col="wrapperCol"
     >
       <a-form-item label="SQL语句" name="Sql">
-        <a-textarea v-model:value="data.formData.Sql" placeholder="Basic usage" :rows="4" />
+        <a-textarea v-model:value="data.formData.Sql" placeholder="SQL语句" :rows="4" />
       </a-form-item>
     </a-form>
   </div>

src/views/demo/form-design/components/VFormDesign/components/ComponentProps.vue

@@ -283,9 +283,9 @@
       watch(
         () => formConfig.value.currentItem?.field,
         (_newValue, oldValue) => {
-          currentIndex.value = formConfig.value.schemas.findIndex(
-            (element) => element.field === formConfig.value.currentItem.field,
-          );
+          // currentIndex.value = formConfig.value.schemas.findIndex(
+          //   (element) => element.field === formConfig.value.currentItem.field,
+          // );
           formConfig.value.schemas &&
             formItemsForEach(formConfig.value.schemas, (item) => {
               if (item.link) {
@@ -310,9 +310,9 @@
         () => formConfig.value.currentItem && formConfig.value.currentItem.component,
         () => {
           // console.log(formConfig.value);
-          currentIndex.value = formConfig.value.schemas.findIndex(
-            (element) => element.field === formConfig.value.currentItem.field,
-          );
+          // currentIndex.value = formConfig.value.schemas.findIndex(
+          //   (element) => element.field === formConfig.value.currentItem.field,
+          // );
           allOptions.value = [];
           baseComponentControlAttrs.forEach((item) => {
             item.category = 'control';
@@ -378,7 +378,8 @@
         let arr = allOptions.value.filter((item) => {
           return item.category == 'input';
         });
-
+        console.log(arr);
+        console.log(currentIndex.value);
         arr.forEach((item) => {
           if (item.name == 'dataTable') {
             if (currentIndex.value == -1) {