1.3.6

.npmignore

@@ -2,4 +2,5 @@
 scripts
 unpackage
 node_modules
-package-lock.json
\ No newline at end of file
+package-lock.json
+uni_modules/uni-config-center/uniCloud/cloudfunctions/common/uni-config-center/uni-pay/
\ No newline at end of file

README/1.3/1.3.6.md

+### vk-unicloud-admin 框架研究Q群:`22466457` 如有问题或建议可以在群内讨论。
+### 更新内容
+#### 1、【升级】`vk-unicloud-admin-ui` 包升级至 `1.3.4`
+#### 2、【修复】万能表单 `array<object>` 嵌套 `array<string>`时，控制台会报错的问题。
+#### 3、【优化】万能表单 `table-select` 组件新增 `dialogWidth` 属性(控制弹窗宽度)
+
+#### 框架更新步骤指南 [点击查看](https://gitee.com/vk-uni/vk-uni-cloud-router/wikis/pages?sort_id=4023455&doc_id=975983)
+##### 框架学习Q群：`22466457` 欢迎萌新和大佬来使用和共同改进框架
+
+### 如果你觉得框架对你有用，可以在下方进行评论，也可以进行赞赏。

changelog.md

+## 1.3.6（2021-07-28）
+### vk-unicloud-admin 框架研究Q群:`22466457` 如有问题或建议可以在群内讨论。
+### 更新内容
+#### 1、【升级】`vk-unicloud-admin-ui` 包升级至 `1.3.4`
+#### 2、【修复】万能表单 `array<object>` 嵌套 `array<string>`时，控制台会报错的问题。
+#### 3、【优化】万能表单 `table-select` 组件新增 `dialogWidth` 属性(控制弹窗宽度)
+
+#### 框架更新步骤指南 [点击查看](https://gitee.com/vk-uni/vk-uni-cloud-router/wikis/pages?sort_id=4023455&doc_id=975983)
+##### 框架学习Q群：`22466457` 欢迎萌新和大佬来使用和共同改进框架
+
+### 如果你觉得框架对你有用，可以在下方进行评论，也可以进行赞赏。
+
 ## 1.3.5（2021-07-22）
 ### vk-unicloud-admin 框架研究Q群:`22466457` 如有问题或建议可以在群内讨论。
 ### 更新内容

package-lock.json

 {
     "name": "vk-unicloud-admin",
-    "version": "1.3.3",
+    "version": "1.3.5",
     "lockfileVersion": 1,
     "requires": true,
     "dependencies": {
@@ -104,9 +104,9 @@
             }
         },
         "vk-unicloud-admin-ui": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/vk-unicloud-admin-ui/-/vk-unicloud-admin-ui-1.3.3.tgz",
-            "integrity": "sha512-dfGzX77JThIw3k/KwXThLPVH1n+qvh099SwDAnoYu2+gSwLQ1SI2nXIEaSPNh4KoyvTTcr69kepQyR/V3sViBw=="
+            "version": "1.3.4",
+            "resolved": "https://registry.npmjs.org/vk-unicloud-admin-ui/-/vk-unicloud-admin-ui-1.3.4.tgz",
+            "integrity": "sha512-1Qp1uEtGgAUSEgoV0dGT/11kdJWRna4kCbdpIS6IZSWORfJnYP1oaoWaZL0SplhgOkUmva1Z2A1GGyQeDBtXvQ=="
         },
         "vuedraggable": {
             "version": "2.24.3",

package.json

 {
     "id": "vk-unicloud-admin",
     "name": "vk-unicloud-admin",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "displayName": "【开箱即用】vk-unicloud-admin - 快速开发框架 - 几分钟即可完成一个页面CRUD",
     "description": "vk-unicloud-admin是基于unicloud+uni-id+element+vk-unicloud-router的一套快速PC admin完整开发框架。丰富的API可以让你开发事半功倍。",
     "keywords": [
@@ -22,7 +22,7 @@
     "dependencies": {
         "element-ui": "^2.15.3",
         "umy-ui": "^1.1.6",
-        "vk-unicloud-admin-ui": "^1.3.3"
+        "vk-unicloud-admin-ui": "^1.3.4"
     },
     "engines": {
         "HBuilderX": "^3.1.10"

uni_modules/vk-unicloud/changelog.md

+## 2.2.6（2021-07-28）
+###  更新内容
+#### 【新增】前端 `vk.callFunction` 支持请求其他服务空间的云函数
+```js
+const myCloud = uniCloud.init({
+  provider: 'aliyun',
+  spaceId: 'xxxx-yyy',
+  clientSecret: 'xxxx'
+});
+vk.callFunction({
+  url: 'template/db_api/pub/count',
+  title:'请求中...',
+  unicloud: myCloud,
+  success(data) {
+    console.log(data);
+  }
+});
+```
+#### 完整框架项目地址：`https://ext.dcloud.net.cn/plugin?id=2204`[点击查看](https://ext.dcloud.net.cn/plugin?id=2204)
+
 ## 2.2.4（2021-07-12）
 ###  更新内容
 ####【修复】已知问题

uni_modules/vk-unicloud/package.json

 {
   "id": "vk-unicloud",
-  "displayName": "vk-unicloud-router开发框架核心库 - 已集成uni-id 框架内置了众多API、工具包，为你的业务扫平障碍。使你的项目刚起步进度就是50%",
-  "version": "2.2.4",
-  "description": "此为vk-unicloud-router开发框架核心库（新手建议直接下载完整框架项目）已集成uni-id支持云函数url化。众多现成API，内置小白也能轻松上手的数据库API。",
+  "displayName": "vk-unicloud-router开发框架核心库 - 已集成uni-id 框架内置了众多API。",
+  "version": "2.2.6",
+  "description": "此为vk-unicloud-router框架核心库（新手建议下载完整框架项目）已集成uni-id支持云函数url化。众多现成API，内置小白也能轻松上手的数据库API。使你项目刚起步进度就是百分之50",
   "keywords": [
     "vk-unicloud-router",
     "云函数路由",
@@ -39,7 +39,7 @@
     "npmurl": ""
   },
   "uni_modules": {
-    "dependencies": ["uni-id","uni-pay"],
+    "dependencies": ["uni-config-center","uni-id","uni-pay"],
     "encrypt": [],
     "platforms": {
       "cloud": {

uni_modules/vk-unicloud/uniCloud/cloudfunctions/common/vk-unicloud/package.json

 {
-	"name": "vk-unicloud",
-	"version": "2.2.2",
-	"description": "【云函数端SDK】VK云函数路由模式uniCloud开发框架，在router目录下执行 npm i vk-unicloud 进行安装和升级",
-	"main": "index.js",
-	"homepage": "https://gitee.com/vk-uni/vk-uni-cloud-router.git",
-	"repository": {
-		"type": "git",
-		"url": "git+https://gitee.com/vk-uni/vk-uni-cloud-router.git"
-	},
-	"author": "VK",
-	"license": "Apache-2.0",
-	"dependencies": {
-		"uni-config-center": "file:../../../../../uni-config-center/uniCloud/cloudfunctions/common/uni-config-center",
-		"uni-id": "file:../../../../../uni-id/uniCloud/cloudfunctions/common/uni-id",
-		"uni-pay": "file:../../../../../uni-pay/uniCloud/cloudfunctions/common/uni-pay"
-	}
-}
+  "name": "vk-unicloud",
+  "version": "2.2.3",
+  "description": "【云函数端SDK】VK云函数路由模式uniCloud开发框架，在router目录下执行 npm i vk-unicloud 进行安装和升级",
+  "main": "index.js",
+  "homepage": "https://gitee.com/vk-uni/vk-uni-cloud-router.git",
+  "repository": {
+    "type": "git",
+    "url": "git+https://gitee.com/vk-uni/vk-uni-cloud-router.git"
+  },
+  "author": "VK",
+  "license": "Apache-2.0"
+}
\ No newline at end of file

uni_modules/vk-unicloud/vk_modules/vk-unicloud-page/libs/vk-unicloud/vk-unicloud-callFunctionUtil.js

@@ -323,7 +323,8 @@ class CallFunctionUtil {
 				provider,
 				file = {},
 				needSave = false,
-				category_id
+				category_id,
+				uniCloud: myCloud
 			} = obj;
 			// 获取文件类型(image:图片 video:视频 other:其他)
 			let fileType = this.getFileType(obj);
@@ -347,8 +348,9 @@ class CallFunctionUtil {
 			let Logger = {};
 			if (config.debug) Logger.filePath = filePath;
 			if (config.debug) Logger.startTime = new Date().getTime();
+			let runCloud = myCloud ? myCloud : uniCloud;
 			return new Promise((resolve, reject) => {
-				uniCloud.uploadFile({
+				runCloud.uploadFile({
 					filePath: filePath,
 					cloudPath: cloudPath,
 					fileType: fileType,
@@ -433,7 +435,8 @@ class CallFunctionUtil {
 			loading,
 			isRequest,
 			name,
-			complete
+			complete,
+			uniCloud: myCloud
 		} = obj;
 		if (title) vk.showLoading(title);
 		if (loading) vk.setLoading(true, loading);
@@ -443,7 +446,8 @@ class CallFunctionUtil {
 		if (config.debug) Logger.params = typeof data == "object" ? JSON.parse(JSON.stringify(data)) : data;
 		let promiseAction = new Promise(function(resolve, reject) {
 			if (config.debug) Logger.startTime = new Date().getTime();
-			uniCloud.callFunction({
+			let runCloud = myCloud ? myCloud : uniCloud;
+			runCloud.callFunction({
 				name: name,
 				data: {
 					$url: url,

使用帮助/代码快捷提示/javascript代码块提示.json

@@ -642,5 +642,36 @@
 		],
 		"triggerAssist": false,
 		"description": "获取数据并返回树状结构"
+	},
+	"vk.baseDao.selects(分组统计查询)": {
+	 "prefix": "baseDao.selects",
+	 "body": [
+			"res = await vk.baseDao.selects({",
+			"\tdbName: \"表名${0}\",",
+			"\tpageIndex: 1,",
+			"\tpageSize: 10,",
+			"\t// 主表where条件",
+			"\twhereJson: {",
+			"\t\t",
+			"\t},",
+			"\tgroupJson: {",
+			"\t\t_id: \"$\", // _id是分组id， $ 后面接字段名，如user_id字段进行分组",
+			"\t\tuser_id: _.$.first(\"$\"), // $ 后面接字段名，如把user_id原样输出",
+			"\t\tmoney: _.$.sum(\"$\"), // $ 后面接字段名，sum求和该字段",
+			"\t},",
+			"\tsortArr: [{ name: \"money\",type: \"desc\" }], // 对分组后的结果进行排序",
+			"\t// 副表列表",
+			"\tforeignDB: [{",
+			"\t\tdbName: \"uni-id-users\",",
+			"\t\tlocalKey: \"user_id\",",
+			"\t\tforeignKey: \"_id\",",
+			"\t\tas: \"userInfo\",",
+			"\t\tlimit: 1",
+			"\t\tfieldJson:{ token:false, password:false },",
+			"\t}]",
+			"});"
+		],
+		"triggerAssist": false,
+		"description": "分组统计查询"
 	}
 }