@yoooloo42/joker 1.0.168 → 1.0.170

package/dist/index.esm.js

@@ -22762,9 +22762,9 @@ const popupFind = async _ref5 => {
     scopeThis
   } = _ref5;
   unclassified.deepClone.replaceObject(scopeThis.formData, scopeThis.query.formData);
-  scopeThis.tableData.query.sort = scopeThis.query && scopeThis.query.sort ? JSON.parse(JSON.stringify(scopeThis.query.sort)) : null;
-  scopeThis.tableData.query.pageSize = scopeThis.query && scopeThis.query.pageSize ? scopeThis.query.pageSize : ly0default$4.pageSize;
-  scopeThis.tableData.query.currentPage = scopeThis.query && scopeThis.query.currentPage ? scopeThis.query.currentPage : 1;
+  scopeThis.tableData.sort = scopeThis.query && scopeThis.query.sort ? JSON.parse(JSON.stringify(scopeThis.query.sort)) : null;
+  scopeThis.tableData.pageSize = scopeThis.query && scopeThis.query.pageSize ? scopeThis.query.pageSize : ly0default$4.pageSize;
+  scopeThis.tableData.currentPage = scopeThis.query && scopeThis.query.currentPage ? scopeThis.query.currentPage : 1;
   unclassified.deepClone.replaceObject(scopeThis.formProps, scopeThis.find.formProps);
   // 弹出窗口
   unclassified.deepClone.deepMerge(scopeThis.formProps.popup, {
@@ -22819,9 +22819,9 @@ const submitFind = async _ref9 => {
     scopeThis
   } = _ref9;
   unclassified.deepClone.replaceObject(scopeThis.query.formData, scopeThis.formData);
-  scopeThis.query.sort = scopeThis.tableData.query && scopeThis.tableData.query.sort ? JSON.parse(JSON.stringify(scopeThis.tableData.query.sort)) : null;
-  scopeThis.query.pageSize = scopeThis.tableData.query && scopeThis.tableData.query.pageSize ? scopeThis.tableData.query.pageSize : ly0default$4.pageSize;
-  scopeThis.query.currentPage = scopeThis.tableData.query && scopeThis.tableData.query.currentPage ? scopeThis.tableData.query.currentPage : 1;
+  scopeThis.query.sort = !!scopeThis.tableData.sort ? JSON.parse(JSON.stringify(scopeThis.tableData.sort)) : null;
+  scopeThis.query.pageSize = !!scopeThis.tableData.pageSize ? scopeThis.tableData.pageSize : ly0default$4.pageSize;
+  scopeThis.query.currentPage = !!scopeThis.tableData.currentPage ? scopeThis.tableData.currentPage : ly0default$4.currentPage;
   const result = await refresh({
     scopeThis
   });
@@ -22965,20 +22965,7 @@ var ly0default$3 = {
     },
     cols: [],
     submit: {
-      switch: false,
-      // true - 提交模式, false - 组件模式
-      watch: false,
-      // 提交监听
-      async handle(_ref) {
-        let {
-          formData,
-          scopeThis
-        } = _ref;
-      },
-      // 异步用户句柄
-      url: '',
-      // 后台提交 - URL地址
-      storpro: '' // 后台提交 - 存储过程
+      switch: true // true - 提交模式, false - 组件模式
     },
     para: {
       inputWidth: '200px',
@@ -24168,9 +24155,6 @@ const props = __props;
 // props属性包装，继承了顶层组件的响应性，页面和js可以使用相同的命名
 let formData_box = props.modelValue;
 const formProps_box = props.myProps;
-
-console.log('测试 111', formProps_box);
-
 const scopeThis_box = props.scopeThis;
 
 const style = reactive({
@@ -24186,40 +24170,10 @@ const hdl = {
     async submit(){
         if(formProps_box.submit.handle){
             // 执行用户句柄
-            const result = await formProps_box.submit.handle({
+            await formProps_box.submit.handle({
                 formData: formData_box,
                 scopeThis: scopeThis_box
             });
-            if(result.code !== 0){
-                return
-            }
-        }
-        
-        // 后台提交 - URL地址
-        if(formProps_box.submit.url){
-            const result = await request.ly0.ly0request({
-                url: formProps_box.submit.url,
-                data: formData_box
-            });
-            if(result.code !== 0){
-                return
-            }
-        }
-        
-        // 后台提交 - 存储过程
-        if(formProps_box.submit.storpro){
-            const result = await request.ly0.storpro({
-                storproName: formProps_box.submit.storpro,
-                data: formData_box
-            });
-            if(result.code !== 0){
-                return
-            }
-        }
-        
-        if(formProps_box.popup){
-            // 关闭表单窗口
-            formProps_box.popup.visible = false;
         }
     }
 };
@@ -24413,9 +24367,6 @@ const props = __props;
 // 顶层组件的props属性需做响应性包装，页面和js可以使用相同的命名
 let formData_box = reactive(props.modelValue);
 const formProps_box = reactive(unclassified.deepClone.deepDefaults(props.myProps, ly0default$3.myProps));
-
-console.log('测试 000', formProps_box);
-
 const scopeThis_box = reactive(props.scopeThis);
 
 return (_ctx, _cache) => {
@@ -42492,15 +42443,12 @@ var ly0default$1 = {
   modelValue: {
     data: [],
     total: 0,
-    query: {
-      formData: null,
-      sort: {
-        label: "",
-        order: ""
-      },
-      pageSize: 10,
-      currentPage: 1
-    }
+    sort: {
+      label: "",
+      order: ""
+    },
+    pageSize: 10,
+    currentPage: 1
   }
 };