@steedos-labs/plugin-workflow 3.0.25 → 3.0.27

package/package.json

@@ -1,8 +1,20 @@
 {
   "name": "@steedos-labs/plugin-workflow",
-  "version": "3.0.25",
+  "version": "3.0.27",
   "main": "package.service.js",
   "license": "MIT",
+  "files": [
+    "main",
+    "src",
+    "designer/dist",
+    "public/applications",
+    "public/office",
+    "public/workflow",
+    "package.service.js",
+    "package.service.yml",
+    "LICENSE.txt",
+    "README.md"
+  ],
   "scripts": {
     "build:watch": "tsc --watch",
     "release": "npm publish --registry https://registry.npmjs.org && npx cnpm sync @steedos-labs/plugin-workflow",

package/public/workflow/index.css

@@ -529,6 +529,13 @@ tbody .color-priority-muted *{
     box-shadow: none;
 }
 
+.steedos-instance-style-table .antd-RadiosControl{
+    margin-left: 0.5rem !important;
+}
+
+.steedos-instance-style-table .antd-CheckboxesControl{
+    margin-left: 0.5rem !important;
+}
 
 .instances-sidebar .steedos-listview-change-button > button > .fa-caret-down{
     display: none;
@@ -556,6 +563,12 @@ tbody .color-priority-muted *{
     height: calc(100vh - 101px);
 }
 
+@media (max-width: 768px){
+    .steedos-instance-detail-wrapper{
+        height: calc(100vh - 64px);
+    }
+}
+
 .steedos-amis-instance-view-body .antd-Panel-title{
     font-size: 14px;
     font-weight: 500;
@@ -627,6 +640,25 @@ tbody .color-priority-muted *{
     border: none !important;
 }
 
+.steedos-instance-style-table .instance-form .td-childfield {
+    padding: 0 !important;
+    border: 1px solid black !important;
+}
+.steedos-instance-style-table .instance-form .td-childfield .antd-Table{
+    margin-bottom: 0px !important;
+}
+
+.steedos-instance-style-table .instance-form .td-childfield .antd-Table .antd-Table-operationCell {
+    border: none !important;
+}
+
+.steedos-instance-style-table .instance-form .td-childfield .antd-Table td:first-child {
+    border-right: none !important;
+}
+.steedos-instance-style-table .antd-Select-value{
+    white-space: unset !important;
+}
+
 
 /* 1. 基础设置：合并边框并去掉表格容器的外边框 */
 .instance-form .antd-Table-table {
@@ -751,6 +783,14 @@ tbody .color-priority-muted *{
   }
 }
 
+.antd-Combo-form .antd-Form-row .antd-Form-col{
+    margin-bottom: 0.75rem !important;
+}
+.antd-Combo-form .antd-Form-row .antd-Form-col .antd-Form-rowInner > div{
+    flex: 1;
+}
+
+
   /* .steedos-instance-detail-wrapper{
         height: auto !important;
     }

package/src/util/templateConverter.js

@@ -28,6 +28,22 @@ function getFieldLabel(fieldDef, fieldName) {
     return fieldName;
 }
 
+const getArgumentsList = (func)=>{
+    let funcString;
+    if (typeof func === 'function') {
+      funcString = func.toString();
+    } else {
+      funcString = func;
+    }
+    const regExp = /function\s*\w*\(([\s\S]*?)\)/;
+    if (regExp.test(funcString)) {
+      const argList = RegExp.$1.split(',');
+      return argList.map(arg => arg.replace(/\s/g, ''));
+    } else {
+      return [];
+    }
+}
+
 function fieldToAmis(fieldName, fieldDef, schema, isColumn = false, isPrint = false) {
     // Handle section type special case
     if (fieldDef && fieldDef.type === 'section') {
@@ -85,6 +101,126 @@ function fieldToAmis(fieldName, fieldDef, schema, isColumn = false, isPrint = fa
             case 'checkbox': type = 'checkboxes'; break;
             case 'select': type = 'select'; break;
             case 'lookup': type = 'select'; break; // Simplified for now
+            case 'odata':
+                type = 'select';
+                const field = fieldDef;
+                const inTable = isColumn;
+                const argsName = getArgumentsList(field.filters);
+                let labelField = field.formula ? field.formula.substr(1, field.formula.length - 2) : 'name';
+                if(labelField.indexOf(".") > -1){
+                    labelField = labelField.substr(labelField.indexOf(".") + 1);
+                }
+                config.multiple = field.is_multiselect;
+
+                // Compress script to single line to avoid JSON parsing issues with control characters
+                const adaptorScript = `
+                    return (async () => {
+                        let options = _.map(payload.value, (item)=>{
+                            const value = item;
+                            item["@label"] = item["${labelField}"];
+                            delete item['@odata.editLink'];
+                            delete item['@odata.etag'];
+                            delete item['@odata.id'];
+                            return {
+                                label: item["@label"],
+                                value: value
+                            }
+                        });
+                        
+                        if(api.selectedIds && api.selectedIds.length > 0){
+                            const loadedIds = options.map(function(opt){ return opt.value._id; });
+                            const missingIds = api.selectedIds.filter(function(id){ return !loadedIds.includes(id); });
+                            if(missingIds.length > 0){
+                                const baseUrl = api.baseUrl;
+                                const idFilter = missingIds.map(function(id){ return "_id eq '" + id + "'"; }).join(" or ");
+                                const fetchUrl = baseUrl + (baseUrl.indexOf('?') > -1 ? '&' : '?') + "$filter=" + idFilter;
+                                try {
+                                    const response = await fetch(fetchUrl, {});
+                                    const data = await response.json();
+                                    if (data && data.value) {
+                                        const missingOptions = _.map(data.value, (item) => {
+                                            const value = item;
+                                            item["@label"] = item["${labelField}"];
+                                            delete item['@odata.editLink'];
+                                            delete item['@odata.etag'];
+                                            delete item['@odata.id'];
+                                            return { label: item["@label"], value: value };
+                                        });
+                                        options.unshift(...missingOptions);
+                                    }
+                                } catch (e) {
+                                    console.error("Failed to fetch missing values", e);
+                                }
+                            }
+                        }
+                        payload.data = { options: options };
+                        return payload;
+                    })();
+                `.replace(/\s+/g, ' ');
+
+                const filtersStr = field.filters ? _.replace(field.filters, /_.pluck/g, '_.map') : '';
+                const requestAdaptorScript = `
+                    const filters = \`${filtersStr}\`;
+                    let url = \`${field.url}\`;
+                    api.baseUrl = url;
+                    if(filters){
+                        let joinKey = url.indexOf('?') > 0 ? '&' : '?';
+                        let _filter = [];
+                        if(filters.startsWith('function(') || filters.startsWith('function (')){
+                            const argsName = ${JSON.stringify(argsName)};
+                            const fun = eval('_fun='+filters);
+                            const funArgs = [];
+                            for(const item of argsName){
+                                funArgs.push(context[item]);
+                            }
+                            _filter = fun.apply({}, funArgs);
+                        }else{
+                            _filter = filters;
+                        }
+
+                        const val = context.value || _.get(context, '${field.code}');
+                        let ids = [];
+                        if(val){
+                            const values = Array.isArray(val) ? val : [val];
+                            ids = values.map((v) => v && (v._id || v)).filter((v) => typeof v === 'string');
+                        }
+
+                        ids = _.uniq(ids);
+                        api.selectedIds = ids;
+                        
+                        if(context.term){
+                            _filter = \`(\${_filter}) and contains(name, '\${context.term}')\`;
+                        }
+                        joinKey = url.indexOf('?') > 0 ? '&' : '?';
+                        api.url = url + joinKey + "$filter=" + _filter;
+                    }else{
+                        api.url = url;
+                    }
+                    api.query = {};
+                    return api;
+                `.replace(/\s+/g, ' ');
+
+                config.autoComplete = {
+                    url: field.url.indexOf('?') < 0 ? `${field.url}?term=\${term}` : `${field.url}&term=\${term}`, 
+                    method: "get",
+                    dataType: "json",
+                    adaptor: adaptorScript,
+                    requestAdaptor: requestAdaptorScript
+                };
+                
+                // Only add trackExpression if there are dependent fields (argsName)
+                if (argsName && argsName.length > 0) {
+                    // Use simpler tracking without |json to avoid potential newline issues in stringified objects
+                    config.autoComplete.trackExpression = _.join(_.map(argsName, (item) => `\${${item}}`), '-');
+                }
+
+                config.source = _.cloneDeep(config.autoComplete);
+                // trackExpression is needed in source to react to dependency changes
+                
+                if(!inTable){
+                    config.searchable = true;
+                }
+                break;
             case 'table':
                 type = 'steedos-input-table';
                 config.columnsTogglable = false;
@@ -287,7 +423,13 @@ function convertTemplate(content, fields, isPrint) {
     });
 
     // --- Sub-phase 2c: Convert afFieldLabelText ---
-    newContent = newContent.replace(/\{\{afFieldLabelText\s+name=["'](.+?)["']\}\}/g, '$1');
+    newContent = newContent.replace(/\{\{afFieldLabelText\s+name=["'](.+?)["']\}\}/g, (match, name) => {
+        const fieldDef = findFieldDef(fields, name);
+        if (fieldDef && fieldDef.is_required) {
+            return `${name}<span class="antd-Form-star" style="display: \${record.step.permissions['${name}'] == 'editable' ? 'inline' : 'none'}">*</span>`;
+        }
+        return name;
+    });
 
     // --- Sub-phase 2d: Convert instanceSignText ---
     newContent = newContent.replace(/\{\{>\s*instanceSignText\s+([\s\S]+?)\}\}/g, (match, args) => {
@@ -334,6 +476,14 @@ function convertTemplate(content, fields, isPrint) {
         return `{% amis %}\n${JSON.stringify(amisSchema, null, 2)}\n{% endamis %}`;
     });
 
+    // --- Sub-phase 2e: Add header for tr-child-table ---
+    // Extract dynamic title from td-childfield-xxx class if present
+    newContent = newContent.replace(/(<tr[^>]*class\s*=\s*["'][^"']*tr-child-table[^"']*["'][^>]*>[\s\S]*?class\s*=\s*["'][^"']*?td-childfield-)([^\s"']+)/gi, 
+        (match, beforeName, name) => {
+            return `<tr><td colspan="10" style="background:#f1f1f1" class="font-bold">${name}</td></tr>${beforeName}${name}`;
+        }
+    );
+
     return newContent;
 }