@steedos-widgets/amis-lib 6.10.12 → 6.10.13

package/dist/index.cjs.js

@@ -15566,6 +15566,13 @@ async function convertSFieldToAmisField(field, readonly, ctx) {
                     labelField: 'label',
                     valueField: 'value'
                 };
+                if(field.isAmis){
+                    delete field.mode;
+                    convertData = {
+                        ...convertData,
+                        ...field
+                    };
+                }
                 const select_menuTpl = `<span class='flex items-center mt-0.5'>
                     <span role='img' aria-label='smile' class='anticon anticon-smile'>
                         <span class='slds-icon_container slds-icon-standard-\${REPLACE(icon,'_','-')}'>
@@ -16803,7 +16810,7 @@ function getFormFields(props, mode = "edit") {
         fields = getTableFieldsWithoutFieldPrefix(fields, fieldPrefix);
     }
     return (fields || []).map(function (item) {
-        let formItem = {
+        let formItem = item.isAmis ? item : {
             "type": "steedos-field",
             "name": item.name,
             "config": item
@@ -16818,6 +16825,9 @@ function getFormFields(props, mode = "edit") {
 function getInputTableCell(field, showAsInlineEditMode) {
     if (showAsInlineEditMode) {
         // 这里不可以用quickEdit，因为amis存在bug：input-table内的字段在行编辑模式时会受到外层相同name的字段的影响 https://github.com/baidu/amis/issues/9653
+        if(field.isAmis){
+            return field;
+        }
         return {
             "type": "steedos-field",
             "config": Object.assign({}, field, {
@@ -16836,6 +16846,16 @@ function getInputTableCell(field, showAsInlineEditMode) {
         }
     }
     else {
+        if(field.isAmis){
+            return {
+                ...field,
+                inInputTable: true,
+                "static": true,
+                "readonly": true,
+                label: field.label,
+                name: field.name
+            };
+        }
         return {
             "type": "steedos-field",
             "config": Object.assign({}, field, {
@@ -17238,6 +17258,7 @@ function getFormPaginationWrapper(props, form, mode) {
             "method": "get",
             "adaptor": `
                 const formBody = ${JSON.stringify(formBody)};
+                console.log('formBody===>', formBody);
                 return {
                     "body": formBody
                 }
@@ -18978,7 +18999,6 @@ const showApproveSignImage = (judge) => {
 };
 
 const getUserApprove = ({ instance, userId }) => {
-  console.log(`getUserApprove===>`, instance, userId);
   const currentTrace = _$1.find(instance.traces, (trace) => {
     return trace.is_finished != true;
   });
@@ -19995,6 +20015,7 @@ const getArgumentsList = (func)=>{
 };
 
 const getFieldEditTpl = async (field, label)=>{
+  console.log('field',field);
   const tpl = {
     label: label === true ? field.name : false,
     name: field.code,
@@ -20202,6 +20223,7 @@ const getFieldEditTpl = async (field, label)=>{
         break;
       case "number":
         tpl.type = "input-number";
+        tpl.precision=2;
         break;
       case "date":
         tpl.type = "input-date";
@@ -20272,7 +20294,6 @@ const getFieldEditTpl = async (field, label)=>{
         tpl.options = getSelectOptions(field);
         break;
       case "odata":
-        console.log('odata field', field);
         const argsName = getArgumentsList(field.filters);
         var labelField = field.formula.substr(1, field.formula.length - 2);
         labelField = labelField.substr(labelField.indexOf(".") + 1);
@@ -20281,9 +20302,7 @@ const getFieldEditTpl = async (field, label)=>{
         // tpl.labelField = labelField;
         // tpl.valueField = "_value";
         tpl.source = {
-          url: _$1.startsWith(field.url, "http")
-            ? field.url
-            : `\${context.rootUrl}${field.url}`,
+          url: field.url,
           method: "get",
           dataType: "json",
           adaptor:`
@@ -20303,28 +20322,32 @@ const getFieldEditTpl = async (field, label)=>{
             return payload;
           `,
           requestAdaptor: `
-            const field = ${JSON.stringify(field)};
-            if(field.filters){
+            const filters = ${_.replace(field.filters, /_.pluck/g, '_.map')};
+            const url = ${field.url}
+            if(filters){
+              console.log('filters', filters);
               const joinKey = field.url.indexOf('?') > 0 ? '&' : '?';
-              if(field.filters.startsWith('function(') || field.filters.startsWith('function (')){
+              if(filters.startsWith('function(') || filters.startsWith('function (')){
                 const argsName = ${JSON.stringify(argsName)};
-                const fun = eval('_fun='+field.filters);
+                const fun = eval('_fun='+filters);
                 const funArgs = [];
                 for(const item of argsName){
                   funArgs.push(context[item])
                 }
-                api.url = field.url + joinKey + "$filter=" + fun.apply({}, funArgs)
+                api.url = url + joinKey + "$filter=" + fun.apply({}, funArgs)
               }else{
-                api.url = field.url + joinKey + "$filter=" + field.filters
+                api.url = url + joinKey + "$filter=" + filters
               }
+            }else{
+              api.url = url  
             }
             api.query = {};
-            console.log('api', api);
             return api;
-          `
+          `,
+          trackExpression: _.join(_.map(argsName, (item)=>{return `\${${item}|json}`}), '-')
         };
-        // delete tpl.source;
-        console.log('odata tpl', tpl);
+        tpl.isAmis=true;
+        console.log(`odata`, tpl);
         break;
       case "html":
         if (tpl.disabled) {
@@ -20401,7 +20424,7 @@ const getFieldReadonlyTpl = async (field, label)=>{
       map[item.value] = item.label;
     });
     tpl.type = 'static';
-    tpl.tpl = `<% var options = ${JSON.stringify(map)}; return (options && options[data.${field.code}]) || ''%>`;
+    tpl.tpl = `<% var options = ${JSON.stringify(map)}; return (options && options[data["${field.code}"]]) || ''%>`;
   }else if(field.type === 'odata'){
     tpl.type = 'static';
     tpl.tpl = `<div>\${${field.code}['@label']}</div>`;
@@ -20552,7 +20575,6 @@ const getFormTrs = async (instance) => {
   const trs = [];
   let tdFields = [];
   let fields = [];
-  console.log('getFormTrs===>', instance.fields);
   _$1.each(instance.fields, (field) => {
     fields.push(field);
     if (field.type === "section" && field.fields) {
@@ -20885,7 +20907,6 @@ const getFlowFormSchema = async (instance, box) => {
   else {
     formContentSchema = await getFormTableView(instance);
   }
-  console.log(`formContentSchema`, formContentSchema);
   const amisSchemaStr = instance.formVersion?.amis_schema;
   
   let initedEvents = [];
@@ -20909,7 +20930,6 @@ const getFlowFormSchema = async (instance, box) => {
     });
   }
 
-  console.log('getFlowFormSchema formContentSchema', formContentSchema);
   return {
     type: "page",
     name: "instancePage",
@@ -21147,7 +21167,6 @@ const getFlowVersion = async (instance) => {
   const result = await amisLib.fetchAPI(`/api/workflow/flow/${instance.flow._id}/version/${instance.flow_version}`, {
     method: "get"
   });
-  console.log(`getFlowVersion: `, result);
   return result;
 };
 
@@ -21155,7 +21174,6 @@ const getFormVersion = async (instance) => {
   const result = await amisLib.fetchAPI(`/api/workflow/form/${instance.form._id}/version/${instance.form_version}`, {
     method: "get"
   });
-  console.log(`getFormVersion: `, result);
   return result;
 };
 
@@ -21276,7 +21294,6 @@ const getInstanceInfo = async (props) => {
   if (!instance) {
     return undefined;
   }
-  console.log(`box====>`, box);
   if (box === "inbox" || box === "draft") {
     userApprove = getUserApprove({ instance, userId });
   }
@@ -21291,9 +21308,6 @@ const getInstanceInfo = async (props) => {
     step = getStep({ flowVersion, stepId: trace.step });
   }
 
-  console.log(`userApprove===>`, userApprove);
-  console.log(`step===>`, step);
-
   let currentStep = getStep({ flowVersion, stepId: ___default["default"].last(instance.traces).step });
 
   const lastCCStep = getLastCCStep(instance, userId);