owl-cli 7.21.0 → 7.25.0

package/defaultTemplate/api/src/services/modelService.jsx

@@ -211,7 +211,7 @@ var @projectCodeService = (function (pigeon) {
                     value = f.getEnvValue(value, env)
                     f.setValue(field.key, value, data)
                 }
-                if((value==null || typeof(value)=='undefined') && field.autoGen=='true'){
+                if(((!value) || typeof(value)=='undefined') && field.autoGen=='true'){
                     value =$.getUUID()
                     f.setValue(field.key,value,data);
                 }
@@ -246,7 +246,7 @@ var @projectCodeService = (function (pigeon) {
                                 value = f.getEnvValue(value, env)
                                 row[subField.origKey] = value;
                             }
-                            if((value==null || typeof(value)=='undefined') && subField.autoGen=='true'){
+                            if(((!value) || typeof(value)=='undefined') && subField.autoGen=='true'){
                                 value = $.getUUID()
                                 row[subField.origKey] = value;
                             }
@@ -755,6 +755,7 @@ var @projectCodeService = (function (pigeon) {
             data.owl_lastModifiedUserId = userId;
             data.owl_lastModifiedIp = ip;
             data.owl_lastModifiedUserAgent = ua;
+            data.obj.owl_modifyTime = new Date().getTime();
 
             var key = pigeon.getRKey(data['owl_createTime'], 13)
             pigeon.deleteFromList(f.getAllListName(), key, id)
@@ -1034,6 +1035,20 @@ var @projectCodeService = (function (pigeon) {
             return filters;
         },
 
+        // 构建通配查询（将 SQL 风格的 % 转为 ES 的 *）
+        buildWildcardQuery:function(k, v){
+            // v 预期包含 % 作为通配符标记，转换为 ES 的 *
+            var value = ('' + v).replace(/%/g, '*');
+            var field = k + ".keyword";
+            var wildcard = {};
+            wildcard[field] = {
+                value: value,
+                // 在 ES 7.10+ 支持不区分大小写
+                case_insensitive: true
+            };
+            return { wildcard: wildcard };
+        },
+
         buildQuery:function(mfilters,searchArgs,keyword,isRecycleBin,meta_fields){
             if(!meta_fields){
                 var meta = spec["#meta"];
@@ -1123,9 +1138,19 @@ var @projectCodeService = (function (pigeon) {
                         if(v){
                             term[k+".keyword"] = trim('' + v)
                             if(isNotClause){
-                                must_not.push({term:term});
+                                if(v.indexOf('%')>-1){
+                                    must_not.push(f.buildWildcardQuery(k, v));
+                                }
+                                else{
+                                    must_not.push({term:term});
+                                }
                             }else{
-                                filters.push({term:term});
+                                if(v.indexOf('%')>-1){
+                                    filters.push(f.buildWildcardQuery(k, v));
+                                }
+                                else{
+                                    filters.push({term:term});
+                                }
                             }
 
                         }

package/examples/models/owlsys/user/org_member/api/src/plugins/addToOrgMember.jsx

@@ -1,4 +1,5 @@
 //#import $owl_mall_u:services/modelService.jsx
+//#import $owl_orgs:services/modelService.jsx
 //#import $owl_org_member:services/modelService.jsx
 //#import @owl:utils/PermissionUtil.jsx
 
@@ -11,7 +12,7 @@ function main(){
     
     
     try{
-        checkBackendPluginPermission("addToOrgMemberPlugin");
+        checkBackendPluginPermission(pluginId);
     }catch(errmsg){
         var ret = {
             state:"err",
@@ -32,7 +33,7 @@ function main(){
     if(!admin){
         var ret = {
             state:"err",
-            msg:"手机号不存在"
+            msg:"用户不存在"
         }
         out.print(JSON.stringify(ret));
         return;
@@ -49,16 +50,33 @@ function main(){
         return;
     }
 
+    var env = checklogin();
+    var orgId = env.orgId;
+    var org = owl_orgsService.get(orgId);
+    if(!org){
+        var ret = {
+            state:"err",
+            msg:"组织不存在"
+        }
+        out.print(JSON.stringify(ret));
+        return;
+    }
+
     // 创建org_user记录
     var orgUser = {
         userId: admin.id,
         name: admin.name || admin.loginId,
+        orgId:org.id,
+        orgName:org.name,
         loginId: admin.loginId,
         realName: admin.realName,
         nickName: admin.nickName,
         mobile: admin.mobile,
         email: admin.email,
-        isEnable: 1
+        isEnable: 1,
+        orgId:env.orgId,
+        _orgId:env.orgId,
+        _orgIds:env.orgIds || [env.orgId]
     };
 
     owl_org_memberService.add(orgUser);

package/examples/models/owlsys/user/org_member.json

@@ -1,8 +1,8 @@
 {
   "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;所属商家",
+  "orgId": "string(16),formSize:2,searchable:true,isId:true;所属商家Id",
+  "orgName": "string(16),formSize:2,searchable:true,isId:true;所属商家",
   "isEnable": "choice,formSize:2,listSize:4,values:1_正常/0_冻结_#be0027,defaultValue:1,searchable:true,hidden:false;状态",
   "name": "string(12),listSize:5,formSize:2,searchable:true;名称",
   "loginId": "string(12),listSize:5,formSize:2,searchable:true,unique:true;登录Id",
@@ -10,9 +10,42 @@
   "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;邮箱",
+
+  "org_member_cat": [
+    {
+      "#meta": {
+        "type": "embed",
+        "keyField": "id",
+        "fieldLabel": "客户分类",
+        "dataSourceModel": "org_member_cat",
+        "readOnly": "true",
+        "fields": [
+          "id",
+          "parent_id",
+          "name",
+          "fullPathIds",
+          "fullPathName",
+          "parentPathIds"
+        ],
+        "tab": "50",
+        "position": "card",
+        "mapping": {
+          "id": "id",
+          "parent_id": "parent_id",
+          "name": "name",
+          "fullPathIds": "fullPathIds",
+          "fullPathName": "fullPathName",
+          "parentPathIds": "parentPathIds"
+        }
+      },
+      "id": "string(10),searchable:true,showList:false;客户分类Id",
+      "name": "string(12),searchable:true;客户分类",
+      "fullPathName": "string(18),hidden:true;完整路径"
+    }
+  ],
   "_t": "org_member",
   "#meta": {
-    "rem": "组织会员管理",
+    "rem": "客户会员",
     "id": "<%=#orgId + '_' + userId%>",
     "projectName": "电商",
     "changeLogEnabled": true,

package/examples/models/owlsys/user/org_member_cat.json

@@ -0,0 +1,24 @@
+{
+  "id": "string(32),isId:true,searchable:true;分类ID",
+  "name": "string(32),searchable:true;分类名称",
+  "fullPathName": "string(64),searchable:true;完整路径名称",
+  "parent_id": "string(32),searchable:true;父级分类ID",
+  "showOnTree": "choice,values:yes_是/no_否,defaultValue:yes,searchable:true;树节点上显示",
+  "_t": "org_member_cat",
+  "#meta": {
+    "rem": "客户分类",
+    "projectName": "客户分类",
+    "parent": ["platform"],
+    "isTree": true,
+    "parentField": "parent_id",
+    "visitType": ["platform"],
+    "pos": 1,
+    "group": {
+      "id": "mall_user",
+      "name": "会员管理",
+      "icon": "user",
+      "pos": 6
+    }
+
+  }
+}

package/examples/owlsysApps/owlShell/src/utils/PermissionUtil.jsx

@@ -1,6 +1,8 @@
+//#import session.js
 //#import $owl_permission:services/modelService.jsx
 //#import $owlPermission:services/RolesService.jsx
-
+//#import $owl_server_token:services/modelService.jsx
+//#import $owl_backend_session:services/modelService.jsx
 function getPermissions(roleId){
     var searchArgs = {
         roleId: roleId
@@ -172,9 +174,7 @@ function checkBackendPluginPermission(pluginId){
         throw "用户角色异常";
     }
 
-    if(!checkPluginPermissionByRoleId( pluginId,rroleId)){
+    if(!checkPluginPermissionByRoleId( pluginId,roleId)){
         throw "没有权限执行此操作";
     }
-
-
 }

package/package.json

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