owl-cli 7.20.0 → 7.21.0

package/docs/tree.md

@@ -0,0 +1,25 @@
+# 树状结构
+## 概述
+树状结构是一种常用的组织数据的方式，它将数据组织成一个层级结构，每个节点可以有多个子节点。比如组织架构、文件目录等，商品分类等都可以使用树状结构来组织。
+
+## owl中的树状结构配置
+在owl框架中，可以使用isTree字段来标识一个实体是否是树状结构的节点。如果isTree为true，则表示该实体是树状结构的节点，否则表示不是。例如：
+
+```
+"#meta": {
+    "rem": "组织结构",
+    "projectName": "代理商",
+    "isTree": true,
+    ...
+}
+```
+
+## 树状结构数据结构关键字段
+
+- id：节点的唯一标识符
+- parent_id：父节点的标识符
+- parent_id：父节点的标识符
+- showOnTree：是否在树状结构中显示该节点，默认值为yes。若果为no, 这不会显示在左侧的树状结构中。一般如果叶子节点的数量量很大，会造成左边的树很大，不好搜索，显示也会慢，就可以将叶子节点的showOnTree设置为no，这样就不会显示在左侧的树状结构中,而会显示在右边的列表中。
+
+![alt text](image.png)
+

package/examples/models/owlsys/organization/orgs.json

@@ -21,7 +21,7 @@
     "regionId": "string(16),isId:true,searchable:true,formSize:2,hidden:true;所在地区ID",
     "regionPath": "linkId,formSize:2,listSize:8,datasource:mall_region,displayField:region_path,fields:id/region_path,toFields:regionId/regionPath;所在地区",
     "ownerId": "string(16),formSize:2,isId:true,searchable:true;主管理员",
-    "showOnTree": "choice,values:yes_是/no_否,defaultValue:no,searchable:true;树节点上显示",
+    "showOnTree": "choice,values:yes_是/no_否,defaultValue:yes,searchable:true;树节点上显示",
     "subDomain": "string(16),formSize:2,hidden:true,searchable:true;二级域名",
     "tag": "string(128),searchable:true,formSize:8;商家标签(说明：多个标签之间可使用竖线分隔)"
   },

package/examples/models/owlsys/region/mall_region/api/src/eventHandlers/autoSetRegionFullPath_addAfter.jsx

@@ -0,0 +1,25 @@
+//#import $commonService:services/RegionUtil.jsx
+//#import $owl_mall_region:services/modelService.jsx
+
+var data = ctx.get("data");
+var id = data.id;
+
+// $.log("\nmall_auth_app....autoSetRegionFullPath_addAfter.jsx...begin...id=" + id);
+
+var jRegion = owl_mall_regionService.get(id);
+jRegion.region_path = RegionUtil.getRegionPath(jRegion, "name", "");
+owl_mall_regionService.update(jRegion);
+
+// $.log("\nmall_auth_app....autoSetRegionFullPath_addAfter.jsx...end...id=" + id);
+
+
+
+
+
+
+
+
+
+
+
+

package/examples/models/owlsys/region/mall_region/api/src/eventHandlers/autoSetRegionFullPath_updateBefore.jsx

@@ -0,0 +1,23 @@
+//#import $commonService:services/RegionUtil.jsx
+//#import $owl_mall_region:services/modelService.jsx
+
+var data = ctx.get("data");
+var id = data.id;
+
+// $.log("\nmall_auth_app....autoSetRegionFullPath_updateBefore.jsx...begin...id=" + id);
+
+data.region_path = RegionUtil.getRegionPath(data, "name", "");
+
+// $.log("\nmall_auth_app....autoSetRegionFullPath_updateBefore.jsx...end...id=" + id);
+
+
+
+
+
+
+
+
+
+
+
+

package/examples/models/owlsys/region/region.json

@@ -0,0 +1,81 @@
+{
+  "base_info": {
+    "#meta": {
+      "fieldLabel": "其他信息",
+      "showTitle": "no",
+      "position": "card",
+      "includeKey": "no",
+      "span": 2
+    },
+    "id":"string(16),listSize:14,searchable:true,unique:true,disabled:true,formSize:3;内部ID",
+    "pos":"string(16),listSize:4,defaultValue:100,searchable:false,required:true,formSize:1;排序",
+    "blank0": "space,formSize:4;空白",
+    "region_id":"string(16),listSize:8,searchable:true,required:true,formSize:3;地区ID",
+    "name":"string(16),listSize:8,searchable:true,required:true,formSize:3;地区名称",
+    "blank1": "space,formSize:2;空白",
+    "parent_id": "string(8),searchable:true,disabled:false,formSize:3;上级地区ID",
+    "parent_name": "string(8),searchable:true,disabled:true,formSize:3;上级地区名称",
+    "blank2": "space,formSize:2;空白",
+    "region_path": "string(16),searchable:false,disabled:true,formSize:6;地址全称"
+  },
+
+  "stand_info": {
+    "#meta": {
+      "fieldLabel": "标准信息",
+      "showTitle": "no",
+      "position": "card",
+      "includeKey": "no",
+      "span": 1
+    },
+    "country_code": "string(8),searchable:true,formSize:8;国家标准编码",
+    "country_name": "string(8),searchable:true,formSize:8;国家标准名称"
+  },
+
+  "ext_info": {
+    "#meta": {
+      "fieldLabel": "其他信息",
+      "showTitle": "no",
+      "position": "card",
+      "includeKey": "no",
+      "span": 1
+    },
+    "owl_createTime":"date,formSize:8,listSize:9,searchable:true,disabled:true;创建时间",
+    "owl_createUserId":"date,formSize:8,listSize:8,searchable:true,disabled:true;创建人"
+  },
+  "_t":"mall_region",
+  "#meta":{
+    "id": "<%=#region_id%>",
+    "rem":"地区管理",
+    "isPublic": true,
+    "projectName":"地区管理",
+    "parent":["platform"],
+    "isTree":true,
+    "parentField": "parent_id",
+    "visitType": [
+      "platform"
+    ],
+    "pos": 9,
+    "group": {
+      "id": "systemadmin",
+      "name": "系统管理",
+      "icon": "setting",
+      "pos": 30
+    },
+    "eventHandlers": [
+      {
+        "handlerId": "mall_region_eventHandlers_autoSetRegionFullPath_addAfter",
+        "pageId": "eventHandlers/autoSetRegionFullPath_addAfter.jsx",
+        "throwException": true,
+        "eventName": "mall_region_add_after",
+        "description": "添加后自动生成完整的地区全称"
+      },
+      {
+        "handlerId": "mall_region_eventHandlers_autoSetRegionFullPath_updateAfter",
+        "pageId": "eventHandlers/autoSetRegionFullPath_updateBefore.jsx",
+        "throwException": true,
+        "eventName": "mall_region_update_before",
+        "description": "修改前后自动生成完整的地区全称"
+      }
+    ]
+  }
+}

package/examples/models/owlsys/user/{org_user/api/src/plugins/addToOrgUser.jsx → org_member/api/src/plugins/addToOrgMember.jsx}

@@ -1,7 +1,9 @@
 //#import $owl_mall_u:services/modelService.jsx
-//#import $org_user:services/modelService.jsx
+//#import $owl_org_member:services/modelService.jsx
 //#import @owl:utils/PermissionUtil.jsx
 
+var pluginId = "addToOrgMemberPlugin";
+
 function main(){
     var params = JSON.parse($body);
     var data = params.data;
@@ -9,7 +11,7 @@ function main(){
     
     
     try{
-        checkBackendPluginPermission("addUserToGroupPlugin");
+        checkBackendPluginPermission("addToOrgMemberPlugin");
     }catch(errmsg){
         var ret = {
             state:"err",
@@ -19,11 +21,6 @@ function main(){
         return;
     }
         
-    
-
-   
-    
-
     var mobile = data.mobile;
     var admin = owl_mall_uService.getUniqueObj('mobile',mobile);
     if(!admin){
@@ -42,11 +39,11 @@ function main(){
     }
     
     // 检查用户是否已存在于org_user中
-    var existingOrgUser = org_userService.getUniqueObj('userId',admin.id);
-    if(existingOrgUser){
+    var existingOrgMember = owl_org_memberService.getUniqueObj('userId',admin.id);
+    if(existingOrgMember){
         var ret = {
             state:"err",
-            msg:"用户已经存在,请勿重复添加"
+            msg:"会员已经存在,请勿重复添加"
         }
         out.print(JSON.stringify(ret));
         return;
@@ -64,7 +61,7 @@ function main(){
         isEnable: 1
     };
 
-    org_userService.add(orgUser);
+    owl_org_memberService.add(orgUser);
     
     var ret = {
         state:"ok",

package/examples/models/owlsys/user/{org_user.json → org_member.json}

@@ -1,5 +1,5 @@
 {
-  "id": "string(12),formSize:2,disabled:true,searchable:true;客户Id",
+  "id": "string(12),formSize:2,disabled:true,searchable:true;会员Id",
   "userId": "string(12),isId:true;用户Id",
   "orgId": "string(16),formSize:2,searchable:true;所属商家Id",
   "orgName": "string(16),formSize:2,searchable:true;所属商家",
@@ -10,9 +10,9 @@
   "nickName": "string(12),listSize:5,formSize:2,searchable:true;昵称",
   "mobile": "string(16),listSize:5,inputType:mobile,formSize:2,searchable:true,unique:true;手机",
   "email": "string(64),formSize:2,searchable:true,unique:true;邮箱",
-  "_t": "org_user",
+  "_t": "org_member",
   "#meta": {
-    "rem": "客户管理",
+    "rem": "组织会员管理",
     "id": "<%=#orgId + '_' + userId%>",
     "projectName": "电商",
     "changeLogEnabled": true,
@@ -34,12 +34,12 @@
 
     "formPlugins": [
       {
-        "label": "添加客户",
-        "id": "addUserToGroupPlugin",
-        "action": "/owl_org_user/plugins/addUserToGroup.jsx",
+        "label": "添加会员",
+        "id": "addToOrgMemberPlugin",
+        "action": "/owl_org_member/plugins/addToOrgMember.jsx",
         "responseAction": "showMessage",
         "inputForm": {
-          "label":"添加客户",
+          "label":"添加会员",
           "fields": {
             "mobile": "string(16),isMobile:true,formSize:8;手机或邮箱或loginId"
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "owl-cli",
-  "version": "7.20.0",
+  "version": "7.21.0",
   "main": "index.js",
   "preferGlobal": true,
   "bin": {