json data

crudapi · Jul 19, 2024 · 8ab1ff1 · 8ab1ff1
1 parent c9e4761
commit 8ab1ff1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/src/components/CTableEdit/CTableEdit.vue b/src/components/CTableEdit/CTableEdit.vue
@@ -695,6 +695,7 @@ export default {
         // (everything except "component" and "parent" props above):
         columnExtProperty: item.columnExtProperty,
         data: item.value,
+        json: this.getData(),
         dataSource: this.dataSource
       }).onOk((data) => {
         item.value = data;

diff --git a/src/components/CTableNew/CTableNew.vue b/src/components/CTableNew/CTableNew.vue
@@ -604,6 +604,7 @@ export default {
         // (everything except "component" and "parent" props above):
         columnExtProperty: item.columnExtProperty,
         data: item.value,
+        json: this.getData(),
         dataSource: this.dataSource
       }).onOk((data) => {
         item.value = data;

diff --git a/src/components/CValueDialog/CValueDialog.vue b/src/components/CValueDialog/CValueDialog.vue
@@ -2,6 +2,10 @@
   <q-dialog  full-width full-height
     ref="dialog" @hide="onDialogHide" persistent>
     <q-card class="q-dialog-plugin" style="height: 600px;">
+      <q-card-actions align="center">
+        <q-btn color="primary" label="确定" unelevated no-caps @click="onOKClick" />
+        <q-btn color="negative" label="取消" unelevated no-caps @click="onCancelClick" />
+      </q-card-actions>
       <iframe
         id="extIframe"
         ref="extIframe"
@@ -11,10 +15,6 @@
         allowfullscreen="true" style="width: 100%;height: 100%;">
         <p>您的浏览器不支持iframes，请使用chrome浏览器.</p >
       </iframe>
-      <q-card-actions align="center">
-        <q-btn color="primary" label="确定" unelevated no-caps @click="onOKClick" />
-        <q-btn color="negative" label="取消" unelevated no-caps @click="onCancelClick" />
-      </q-card-actions>
     </q-card>
   </q-dialog>
 </template>
@@ -27,6 +27,9 @@ export default {
     },
     data: {
       required: true
+    },
+    json: {
+      required: false
     }
   },
 
@@ -52,6 +55,9 @@ export default {
       window.crudapi.getParentValue = function() {
         return that.getParentValue();
       };
+      window.crudapi.getParentJson = function() {
+        return that.getParentJson();
+      };
       this.$refs.dialog.show();
     },
 
@@ -98,6 +104,10 @@ export default {
     getParentValue() {
       console.info("getParentValue:" + this.data);
       return this.data;
+    },
+    getParentJson() {
+      console.info("getParentJson:" + this.json);
+      return this.json;
     }
   }
 }

diff --git a/src/pages/Setting.vue b/src/pages/Setting.vue
@@ -47,6 +47,10 @@ export default {
 
       const value = window.parent.crudapi.getParentValue();
       console.info("window.parent.crudapi.getParentValue: " + value);
+
+      const json = window.parent.crudapi.getParentJson();
+      console.info("window.parent.crudapi.getParentJson: ");
+      console.dir(json);
     },
 
     resetAction() {