@byteluck-fe/model-driven-upgrade 2.21.0-beta.9 → 2.22.0-beta.1

package/dist/esm/upgrade/v3_4.js

@@ -4,8 +4,8 @@
  * @Date: 2024-01-22 14:16:13
  * @LastEditors: SuperLuckyqi
  * @LastEditTime: 2024-05-11 14:44:13
- */ import { loop, CONTROL_TYPE, decamelizeKeys } from "@byteluck-fe/model-driven-shared";
-import { MetaRowHeight } from "@byteluck-fe/model-driven-core";
+ */ import { loop, CONTROL_TYPE, decamelizeKeys } from '@byteluck-fe/model-driven-shared';
+import { MetaRowHeight } from '@byteluck-fe/model-driven-core';
 function postProcess(controlMap, payload) {
     if ((payload === null || payload === void 0 ? void 0 : payload.formType) === 1 && (payload === null || payload === void 0 ? void 0 : payload.events) !== undefined) {
         var _payload_events;
@@ -14,12 +14,12 @@ function postProcess(controlMap, payload) {
         //本次转换将把原有的列表did_mount事件内容更换到did_init事件中。
         var did_mount = (_payload_events_did_mount = payload === null || payload === void 0 ? void 0 : (_payload_events = payload.events) === null || _payload_events === void 0 ? void 0 : _payload_events.did_mount) !== null && _payload_events_did_mount !== void 0 ? _payload_events_did_mount : [];
         if (did_mount.length > 0) {
-            payload.events["did_init"] = did_mount;
-            payload.events["did_mount"] = [];
+            payload.events['did_init'] = did_mount;
+            payload.events['did_mount'] = [];
         }
         //默认需要补充新的 did_init 事件
-        if (payload.events["did_init"] === undefined) {
-            payload.events["did_init"] = [];
+        if (payload.events['did_init'] === undefined) {
+            payload.events['did_init'] = [];
         }
     // 注意：这里没有改变schema，仅升级表单的可视化事件
     }
@@ -42,7 +42,7 @@ function conversion(schema, payload) {
     if (schema.type === CONTROL_TYPE.TEXTAREA) {
         var _schema_props_line_ellipsis, _schema_props_max_rows, _schema_props_line_ellipsis1;
         var setting = {
-            rowHeightType: schema.props.auto_size === true ? "auto" : "fixed",
+            rowHeightType: schema.props.auto_size === true ? 'auto' : 'fixed',
             minRows: (_schema_props_line_ellipsis = schema.props.line_ellipsis) !== null && _schema_props_line_ellipsis !== void 0 ? _schema_props_line_ellipsis : 4,
             maxRows: (_schema_props_max_rows = schema.props.max_rows) !== null && _schema_props_max_rows !== void 0 ? _schema_props_max_rows : 20,
             fiexdRow: (_schema_props_line_ellipsis1 = schema.props.line_ellipsis) !== null && _schema_props_line_ellipsis1 !== void 0 ? _schema_props_line_ellipsis1 : 4
@@ -57,11 +57,11 @@ function conversion(schema, payload) {
             var displayBoList = config === null || config === void 0 ? void 0 : config.display_bo_list;
             if (displayBoList) {
                 displayBoList.forEach(function(item) {
-                    if (item.value === "org_type_code") {
-                        item.label = "业务类型";
+                    if (item.value === 'org_type_code') {
+                        item.label = '业务类型';
                     }
-                    if (item.value === "org_pattern_code") {
-                        item.label = "组织形态";
+                    if (item.value === 'org_pattern_code') {
+                        item.label = '组织形态';
                     }
                 });
             }

package/dist/esm/upgrade/v3_5.js

@@ -4,7 +4,7 @@
  * @Date: 2024-01-22 14:16:13
  * @LastEditors: SuperLuckyqi
  * @LastEditTime: 2024-01-22 14:19:43
- */ import { loop, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
+ */ import { loop, CONTROL_TYPE } from '@byteluck-fe/model-driven-shared';
 var dataCleaner = function(schemaItems, payload) {
     var isArray = Array.isArray(schemaItems);
     var schemaArray = isArray ? schemaItems : [
@@ -31,27 +31,27 @@ function postProcess(controlMap, payload) {
             if ((control === null || control === void 0 ? void 0 : control.type) === CONTROL_TYPE.BUTTON) {
                 var _control_props_opt_obj, _control_props, _control_props_opt_obj1, _control_props1, _payload_dataModelExtend;
                 if ([
-                    "draft",
-                    "form_submit",
-                    "save"
+                    'draft',
+                    'form_submit',
+                    'save'
                 ].includes((_control_props = control.props) === null || _control_props === void 0 ? void 0 : (_control_props_opt_obj = _control_props.opt_obj) === null || _control_props_opt_obj === void 0 ? void 0 : _control_props_opt_obj.opt_type)) {
                     controlDef === null || controlDef === void 0 ? void 0 : controlDef.map(function(event) {
                         var _event_cases, _event_cases__handlers, _event_cases_, _event_cases1;
                         event === null || event === void 0 ? void 0 : (_event_cases = event.cases) === null || _event_cases === void 0 ? void 0 : _event_cases.map(function(caseItem) {
                             var _caseItem_handlers;
                             caseItem === null || caseItem === void 0 ? void 0 : (_caseItem_handlers = caseItem.handlers) === null || _caseItem_handlers === void 0 ? void 0 : _caseItem_handlers.map(function(handler) {
-                                if ((handler === null || handler === void 0 ? void 0 : handler.method) === "optPage") {
-                                    if (handler.params.operation === "refresh") {
-                                        handler.params.operation = "close";
+                                if ((handler === null || handler === void 0 ? void 0 : handler.method) === 'optPage') {
+                                    if (handler.params.operation === 'refresh') {
+                                        handler.params.operation = 'close';
                                     }
                                 }
-                                if ((handler === null || handler === void 0 ? void 0 : handler.method) === "openPage") {
+                                if ((handler === null || handler === void 0 ? void 0 : handler.method) === 'openPage') {
                                     var _handler_params_options_link_fx, _handler_params_options_link, _handler_params_options, _handler_params;
                                     if (((_handler_params = handler.params) === null || _handler_params === void 0 ? void 0 : (_handler_params_options = _handler_params.options) === null || _handler_params_options === void 0 ? void 0 : (_handler_params_options_link = _handler_params_options.link) === null || _handler_params_options_link === void 0 ? void 0 : (_handler_params_options_link_fx = _handler_params_options_link.fx) === null || _handler_params_options_link_fx === void 0 ? void 0 : _handler_params_options_link_fx.expression) === "GET_FORM_URL(GET_PAYLOAD_VAL('value').data_uid,{type:'edit'})") {
-                                        handler.id = "optPage";
-                                        handler.method = "optPage";
+                                        handler.id = 'optPage';
+                                        handler.method = 'optPage';
                                         handler.params = {
-                                            operation: "close"
+                                            operation: 'close'
                                         };
                                     }
                                 }
@@ -59,10 +59,10 @@ function postProcess(controlMap, payload) {
                         });
                         if ((event === null || event === void 0 ? void 0 : (_event_cases1 = event.cases) === null || _event_cases1 === void 0 ? void 0 : (_event_cases_ = _event_cases1[0]) === null || _event_cases_ === void 0 ? void 0 : (_event_cases__handlers = _event_cases_.handlers) === null || _event_cases__handlers === void 0 ? void 0 : _event_cases__handlers.length) === 1) {
                             event.cases[0].handlers.push({
-                                id: "optPage",
-                                method: "optPage",
+                                id: 'optPage',
+                                method: 'optPage',
                                 params: {
-                                    operation: "close"
+                                    operation: 'close'
                                 }
                             });
                         }
@@ -70,13 +70,13 @@ function postProcess(controlMap, payload) {
                 }
                 //数据审核模式 && 提交按钮，最后的关闭事件要变成刷新。其他情况不改动。即：非数据审核模式 提交、保存、保存草稿 都是关闭
                 if ([
-                    "form_submit"
-                ].includes((_control_props1 = control.props) === null || _control_props1 === void 0 ? void 0 : (_control_props_opt_obj1 = _control_props1.opt_obj) === null || _control_props_opt_obj1 === void 0 ? void 0 : _control_props_opt_obj1.opt_type) && ((_payload_dataModelExtend = payload.dataModelExtend) === null || _payload_dataModelExtend === void 0 ? void 0 : _payload_dataModelExtend.process_status_enum_type) === "business") {
+                    'form_submit'
+                ].includes((_control_props1 = control.props) === null || _control_props1 === void 0 ? void 0 : (_control_props_opt_obj1 = _control_props1.opt_obj) === null || _control_props_opt_obj1 === void 0 ? void 0 : _control_props_opt_obj1.opt_type) && ((_payload_dataModelExtend = payload.dataModelExtend) === null || _payload_dataModelExtend === void 0 ? void 0 : _payload_dataModelExtend.process_status_enum_type) === 'business') {
                     controlDef === null || controlDef === void 0 ? void 0 : controlDef.map(function(event) {
                         event.cases[0].handlers.map(function(handler) {
-                            if ((handler === null || handler === void 0 ? void 0 : handler.method) === "optPage") {
-                                if (handler.params.operation === "close") {
-                                    handler.params.operation = "edit";
+                            if ((handler === null || handler === void 0 ? void 0 : handler.method) === 'optPage') {
+                                if (handler.params.operation === 'close') {
+                                    handler.params.operation = 'edit';
                                 }
                             }
                         });

package/dist/esm/upgrade/v3_6.js

@@ -4,7 +4,7 @@
  * @Date: 2024-01-22 14:16:13
  * @LastEditors: SuperLuckyqi
  * @LastEditTime: 2024-01-22 14:19:43
- */ import { loop, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
+ */ import { loop, CONTROL_TYPE } from '@byteluck-fe/model-driven-shared';
 var dataCleaner = function(schemaItems, payload) {
     var isArray = Array.isArray(schemaItems);
     var schemaArray = isArray ? schemaItems : [
@@ -26,11 +26,11 @@ function conversion(schema, payload) {
         var displayBoList = config === null || config === void 0 ? void 0 : config.display_bo_list;
         if (displayBoList) {
             displayBoList.forEach(function(item) {
-                if (item.value === "org_type_code") {
-                    item.label = "业务类型";
+                if (item.value === 'org_type_code') {
+                    item.label = '业务类型';
                 }
-                if (item.value === "org_pattern_code") {
-                    item.label = "组织形态";
+                if (item.value === 'org_pattern_code') {
+                    item.label = '组织形态';
                 }
             });
         }
@@ -45,12 +45,12 @@ function postProcess(controlMap, payload) {
         //本次转换将把原有的列表did_mount事件内容更换到did_init事件中。
         var did_mount = (_payload_events_did_mount = payload === null || payload === void 0 ? void 0 : (_payload_events = payload.events) === null || _payload_events === void 0 ? void 0 : _payload_events.did_mount) !== null && _payload_events_did_mount !== void 0 ? _payload_events_did_mount : [];
         if (did_mount.length > 0) {
-            payload.events["did_init"] = did_mount;
-            payload.events["did_mount"] = [];
+            payload.events['did_init'] = did_mount;
+            payload.events['did_mount'] = [];
         }
         //默认需要补充新的 did_init 事件
-        if (payload.events["did_init"] === undefined) {
-            payload.events["did_init"] = [];
+        if (payload.events['did_init'] === undefined) {
+            payload.events['did_init'] = [];
         }
     // 注意：这里没有改变schema，仅升级表单的可视化事件
     }

package/dist/esm/upgrade/v3_7.js

@@ -4,7 +4,7 @@
  * @Date: 2024-01-22 14:16:13
  * @LastEditors: SuperLuckyqi
  * @LastEditTime: 2024-01-22 14:19:43
- */ import { loop, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
+ */ import { loop, CONTROL_TYPE } from '@byteluck-fe/model-driven-shared';
 var dataCleaner = function(schemaItems, payload) {
     var isArray = Array.isArray(schemaItems);
     var schemaArray = isArray ? schemaItems : [
@@ -38,11 +38,11 @@ function conversion(schema, payload) {
         var displayBoList = config === null || config === void 0 ? void 0 : config.display_bo_list;
         if (displayBoList) {
             displayBoList.forEach(function(item) {
-                if (item.value === "org_type_code") {
-                    item.label = "业务类型";
+                if (item.value === 'org_type_code') {
+                    item.label = '业务类型';
                 }
-                if (item.value === "org_pattern_code") {
-                    item.label = "组织形态";
+                if (item.value === 'org_pattern_code') {
+                    item.label = '组织形态';
                 }
             });
         }

package/dist/esm/upgrade/v3_8.js

@@ -1,4 +1,4 @@
-import { loop, CONTROL_TYPE } from "@byteluck-fe/model-driven-shared";
+import { loop, CONTROL_TYPE } from '@byteluck-fe/model-driven-shared';
 var dataCleaner = function(schemaItems, payload) {
     var isArray = Array.isArray(schemaItems);
     var schemaArray = isArray ? schemaItems : [
@@ -17,7 +17,7 @@ function conversion(schema, payload) {
         schema.children.forEach(function(item) {
             if (item.type === CONTROL_TYPE.SELECT || item.type === CONTROL_TYPE.SELECT_MULTIPLE) {
                 var selectInstance = item;
-                if (selectInstance.props.option_config === "datasource") {
+                if (selectInstance.props.option_config === 'datasource') {
                     selectInstance.props.default_show_options = false;
                 }
             }
@@ -33,31 +33,35 @@ function conversionRowStyle(schema) {
         var rowStyle = {
             "type": (_props_row_style_type = props.row_style_type) !== null && _props_row_style_type !== void 0 ? _props_row_style_type : "none",
             "interval": {
-                "color": (_props_row_style_bg_color = props.row_style_bg_color) !== null && _props_row_style_bg_color !== void 0 ? _props_row_style_bg_color : ""
+                "color": (_props_row_style_bg_color = props.row_style_bg_color) !== null && _props_row_style_bg_color !== void 0 ? _props_row_style_bg_color : ''
             },
             "rules": []
         };
         if (props.row_style_rules) {
-            props.row_style_rules.forEach(function(item) {
-                var id = item.id;
+            props.row_style_rules.forEach(function(rule) {
+                var id = rule.id;
                 var setting = {
-                    "color": item.color,
+                    "color": rule.color,
                     "type": "background",
                     "scope": "row",
-                    "fieldCodes": []
+                    "fieldCodes": [
+                        "_row_"
+                    ]
                 };
                 var script;
                 if (props.row_style_rules_script) {
                     var scriptItem = props.row_style_rules_script.find(function(scriptItem) {
                         return scriptItem.id === id;
                     });
-                    script = scriptItem.script;
+                    if (scriptItem) {
+                        script = parseScript(rule.filters, scriptItem.script);
+                    }
                 }
-                item.settings = [
+                rule.settings = [
                     setting
                 ];
-                item.script = script;
-                delete item.color;
+                rule.script = script;
+                delete rule.color;
             });
             rowStyle.rules = props.row_style_rules;
         }
@@ -68,6 +72,95 @@ function conversionRowStyle(schema) {
         delete props.row_style_rules_script;
     }
 }
+function getRuleLeftValuesOfNeedSpecialMatch(filters, leftValues) {
+    if (!leftValues) {
+        leftValues = {};
+    }
+    filters.forEach(function(filter) {
+        if (filter.children) {
+            getRuleLeftValuesOfNeedSpecialMatch(filter.children, leftValues);
+        } else {
+            var left = filter.left_variable_bo;
+            switch(left.type){
+                case 'people':
+                case 'department':
+                case 'array':
+                case 'timestamp':
+                    var field = left.value;
+                    leftValues[field] = left;
+                    break;
+            }
+        }
+    });
+    return leftValues;
+}
+function getScriptList(script) {
+    script = script.replace(/\(|\)/g, '').replace(/(\|\|)|(&&)/g, '__split__');
+    var list = script.split('__split__').map(function(str) {
+        return str.replace(/^\s+|\s+$/gm, '');
+    });
+    return list;
+}
+function getScriptOperateAndValue(script) {
+    var operate = '';
+    var value = '';
+    if (script[0] === '!') {
+        operate = 'is_empty';
+    } else {
+        var match = script.match(/(===|!=|>|>=|<|<=)/);
+        if (match) {
+            var oldOperate = match[0];
+            switch(oldOperate){
+                case '===':
+                    operate = 'op_equal';
+                    break;
+                case '!=':
+                    operate = 'op_no_equal';
+                    break;
+                case '>':
+                    operate = 'op_greater';
+                    break;
+                case '>=':
+                    operate = 'op_greater_equal';
+                    break;
+                case '<':
+                    operate = 'op_less';
+                    break;
+                case '<=':
+                    operate = 'op_less_equal';
+                    break;
+                default:
+                    operate = 'is_not_empty';
+                    break;
+            }
+            value = script.split(oldOperate)[1] || '';
+        } else {
+            operate = 'is_not_empty';
+        }
+    }
+    return {
+        operate: operate,
+        value: value
+    };
+}
+function parseScript(filters, script) {
+    var leftValues = getRuleLeftValuesOfNeedSpecialMatch(filters);
+    var scriptList = getScriptList(script);
+    scriptList.forEach(function(scriptItem) {
+        Object.keys(leftValues).forEach(function(field) {
+            var index = scriptItem.indexOf("params.data.data_value_map['".concat(field, "']"));
+            if (index > -1) {
+                var left = leftValues[field];
+                var type = left.type;
+                var _getScriptOperateAndValue = getScriptOperateAndValue(scriptItem), operate = _getScriptOperateAndValue.operate, value = _getScriptOperateAndValue.value;
+                var newScriptItem = "SpecialMatch(data, sys, '".concat(field, "', '").concat(type, "', '").concat(operate, "', ").concat(value ? value : "''", ")");
+                script = script.replace(scriptItem, newScriptItem);
+            }
+        });
+    });
+    script = script.replace(/params.data.data_value_map/g, 'data');
+    return script;
+}
 function conversionFootersToHeaders(schema) {
     if (schema[0].type === CONTROL_TYPE.LIST_VIEW) {
         var tableSchema = schema[0].children.find(function(item) {
@@ -79,11 +172,11 @@ function conversionFootersToHeaders(schema) {
             var footersObj = {};
             if (footers && footers.length > 0) {
                 footers.forEach(function(item) {
-                    var id = item.id.replace("foot_", "");
+                    var id = item.id.replace('foot_', '');
                     var children = item.children;
                     if (children && children.length > 0) {
                         if (item.children[0].type !== CONTROL_TYPE.BUTTON) {
-                            item.children[0].field_type = item.field_type || "varchar";
+                            item.children[0].field_type = item.field_type || 'varchar';
                         }
                     }
                     footersObj[id] = item;