cuiqian2004
2024-09-06 bbf4ef74df2bf1e075710b433ecffc46a8562c51
test
7个文件已修改
391 ■■■■■ 已修改文件
locale/en.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
locale/es.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
locale/zh-Hans.json 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
locale/zh-Hant.json 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
manifest.json 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/modal/3018_2.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/modal/5601.vue 371 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
locale/en.json
@@ -91,6 +91,7 @@
    "page.execute_after_delete_event_failed": "Failed to execute 'after_delete' event",
    "page.execute_query_event_failed": "Failed to execute 'Query_Event' event",
    "page.icon_click_event_empty": "The icon click event is null",
    "page.icon_click_callback_empty": "Icon click callback event is empty",
    "page.after_select_event_empty": "‘after_select’ event is null",
    "page.before_select_event_empty": "‘before_select’ event is null",
    "page.tip_action_unprocessed": "This action has not been processed yet",
locale/es.json
@@ -90,6 +90,7 @@
    "page.execute_after_delete_event_failed": "Falló la ejecución del evento 'after_delete'.",
    "page.execute_query_event_failed": "Falló la ejecución del evento 'Query_Event'.",
    "page.icon_click_event_empty": "El icono hace clic en el evento en blanco",
    "page.icon_click_callback_empty": "Icono haga clic en el evento de devolución de llamada en blanco",
    "page.after_select_event_empty": "El evento 'after_select' está vacío",
    "page.before_select_event_empty": "El evento 'before_select' está vacío",
    "page.tip_action_unprocessed": "Esta acción aún no se ha tramitado",
locale/zh-Hans.json
@@ -64,7 +64,7 @@
    "page.mobox3_app_type": "mobox3 pda应用类型",
    "page.mobox3_port": "mobox3服务端口",
    "page.input_server": "请输入服务地址",
    "page.input_server": "请输入服务地址",
    "page.set_server": "设置服务",
    "page.tip_app_update": "系统有新版本,是否需要更新?",
    "page.tip_no_web_server": "未输入网站地址,请重新配置输入",
@@ -74,7 +74,7 @@
    "page.tip_get_file_fail_last": "文件失败",
    "page.update_success": "更新成功",
    "page.update_fail": "更新失败",
    "page.tip_no_app_param": "该功能点未配置参数,请重新配置参数",
    "page.select_user": "选择人员",
@@ -93,6 +93,7 @@
    "page.execute_after_delete_event_failed": "执行‘删除后’事件失败",
    "page.execute_query_event_failed": "执行“查询事件”事件失败",
    "page.icon_click_event_empty": "图标点击事件为空",
    "page.icon_click_callback_empty": "图标点击回调事件为空",
    "page.after_select_event_empty": "‘选择后’事件为空",
    "page.before_select_event_empty": "‘选择前’事件为空",
    "page.tip_action_unprocessed": "此action尚未处理",
@@ -125,9 +126,9 @@
    "page.function_not_edit_dlg": "该功能点未配置编辑窗口!",
    "page.no_find_attr_diaplay": "未找到可显示的的属性!",
    "page.cannot_prj_function": "暂时未支持选择项目接口!"
}
locale/zh-Hant.json
@@ -90,6 +90,7 @@
    "page.execute_after_delete_event_failed": "執行‘删除後’事件失敗",
    "page.execute_query_event_failed": "執行“査詢事件”事件失敗",
    "page.icon_click_event_empty": "圖標點擊事件為空",
    "page.icon_click_callback_empty": "圖標點擊回檔事件為空",
    "page.after_select_event_empty": "‘選擇後’事件為空",
    "page.before_select_event_empty": "‘選擇前’事件為空",
    "page.tip_action_unprocessed": "此action尚未處理",
manifest.json
@@ -2,8 +2,8 @@
    "name" : "MoboxPDA",
    "appid" : "__UNI__56D451E",
    "description" : "",
    "versionName" : "1.1.19",
    "versionCode" : 1119,
    "versionName" : "1.1.20",
    "versionCode" : 1120,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
pages/modal/3018_2.vue
@@ -883,7 +883,7 @@
                if (!onSuffixClickCallbackEvent.id) {
                    uni.showModal({
                        title: this.translateSys("tip"),
                        content: this.translate('icon_click_event_empty'),
                        content: this.translate('icon_click_callback_empty'),
                        showCancel: false,
                        confirmText: this.translateSys("cancel")
                    });
pages/modal/5601.vue
@@ -223,9 +223,11 @@
                    keys.forEach(function(key2, index) {
                        if (index + 1 == keys.length) {
                            that.$set(data, key2, val);
                            console.log("$set", key2, val)
                        } else {
                            if (!data[key2]) {
                                that.$set(data, key2, {});
                                console.log("$set", key2, {})
                            }
                        }
                        data = data[key2];
@@ -1020,121 +1022,8 @@
                                            "set_dlg_attr") {
                                            // value = {"attr":"xxx", "value":"xxx"}
                                            var data = item.value;
                                            $this.$data.head_styledef
                                                .form.items.forEach(
                                                    async (
                                                        ele, index
                                                    ) => {
                                                        if (ele
                                                            .name !=
                                                            "Layout"
                                                        ) {
                                                            data.forEach(
                                                                async (ele2,
                                                                    index
                                                                ) => {
                                                                    if (ele
                                                                        .fieldId ==
                                                                        ele2
                                                                        .attr
                                                                    ) {
                                                                        if (ele.name ==
                                                                            'Select' &&
                                                                            ele2
                                                                            .choice_list
                                                                        ) {
                                                                            const
                                                                                dictItemList = [];
                                                                            const
                                                                                choiceList =
                                                                                ele2
                                                                                .choice_list ||
                                                                                [];
                                                                            for (let d in
                                                                                    choiceList) {
                                                                                const
                                                                                    val =
                                                                                    choiceList[
                                                                                        d
                                                                                    ];
                                                                                dictItemList
                                                                                    .push({
                                                                                        text: val,
                                                                                        value: val
                                                                                    });
                                                                            }
                                                                            ele.dict =
                                                                                dictItemList;
                                                                        }
                                                                        ele.value =
                                                                            ele2
                                                                            .value;
                                                                    }
                                                                });
                                                        } else {
                                                            ele.setting
                                                                .colList
                                                                .forEach(
                                                                    async (
                                                                        col
                                                                    ) => {
                                                                        if (
                                                                            col) {
                                                                            data.forEach(
                                                                                async (ele2,
                                                                                    index
                                                                                ) => {
                                                                                    if (col
                                                                                        .fieldId ==
                                                                                        ele2
                                                                                        .attr
                                                                                    ) {
                                                                                        if (col
                                                                                            .name ==
                                                                                            'Select' &&
                                                                                            ele2
                                                                                            .choice_list
                                                                                        ) {
                                                                                            const
                                                                                                dictItemList = [];
                                                                                            const
                                                                                                choiceList =
                                                                                                ele2
                                                                                                .choice_list ||
                                                                                                [];
                                                                                            for (
                                                                                                let d in
                                                                                                    choiceList
                                                                                            ) {
                                                                                                const
                                                                                                    val =
                                                                                                    choiceList[
                                                                                                        d
                                                                                                    ];
                                                                                                dictItemList
                                                                                                    .push({
                                                                                                        text: val,
                                                                                                        value: val
                                                                                                    });
                                                                                            }
                                                                                            col.dict =
                                                                                                dictItemList;
                                                                                        }
                                                                                        col.value =
                                                                                            ele2
                                                                                            .value;
                                                                                    }
                                                                                });
                                                                        }
                                                                    })
                                                        }
                                                    })
                                            $this.setFormValues(data)
                                        }
                                    });
                                } else {
@@ -1202,11 +1091,13 @@
            //更新分页签中的列表项内容
            viewActionSetRow(value) {
                const $this = this
                const pageData = $this.pageDetail.find((page) => {
                const pageIndex = $this.pageDetail.findIndex((
                    page, index2, arr) => {
                    return value.page_name == page.Name;
                });
                if (!pageData)
                })
                if (pageIndex < 0)
                    return
                const pageData = $this.pageDetail[pageIndex]
                var detailStyleDefList = pageData.DefList || []
                detailStyleDefList.forEach(ele => {
                    value.row.forEach((rowData) => {
@@ -1262,6 +1153,7 @@
                    })
                });
                pageData.DefList = detailStyleDefList
                $this.$set(this.pageDetail, pageIndex, pageData)
            },
            //加载正在码盘内容
@@ -1270,11 +1162,13 @@
                if (JSON.stringify(data.row) == '{}') {
                    return;
                }
                const pageData = this.pageDetail.find((page) => {
                const pageIndex = $this.pageDetail.findIndex((
                    page, index2, arr) => {
                    return data.page_name == page.Name;
                });
                if (!pageData)
                })
                if (pageIndex < 0)
                    return
                const pageData = $this.pageDetail[pageIndex]
                var styleStr = JSON.stringify(pageData.StyleDef);
                var detailStyle = JSON.parse(styleStr);
@@ -1309,18 +1203,21 @@
                        });
                        pageData.DefList.push(detailStyle);
                        this.$set(this.pageDetail, pageIndex, pageData)
                    });
                }
            },
            //加载已码盘内容
            viewAceionContent(data) {
                var $this = this;
                const pageData = $this.pageDetail.find((page) => {
                const pageIndex = $this.pageDetail.findIndex((
                    page, index2, arr) => {
                    return data.page_name == page.Name;
                });
                if (!pageData)
                })
                if (pageIndex < 0)
                    return
                const pageData = $this.pageDetail[pageIndex]
                pageData.ExtData = data.ext_data || {}
                if (JSON.stringify(data.content) == '{}') {
@@ -1407,6 +1304,8 @@
                        } else {
                            pageData.DefList.push(detailStyle); //待分拣
                        }
                        // $this.setData({pageDetail:pageD})
                        $this.$set(this.pageDetail, pageIndex, pageData)
                        $this.activelist.push({
                            active: false
                        });
@@ -1414,6 +1313,109 @@
                }
            },
            setFormValues(data) {
                const head_styledef = this.head_styledef
                if (JSON.stringify(data) == '{}') {
                    return;
                }
                head_styledef.form.items.forEach(async (ele, index) => {
                    if (ele.name != "Layout") {
                        let curIndex = data.findIndex((attr, index2, arr) => {
                            return attr.attr == ele.fieldId;
                        })
                        if (curIndex > -1) {
                            const attr = data[curIndex]
                            if (ele.name ==
                                'Select' &&
                                attr
                                .choice_list
                            ) {
                                const
                                    dictItemList = [];
                                const
                                    choiceList =
                                    attr
                                    .choice_list || [];
                                for (let d in
                                        choiceList) {
                                    const
                                        val =
                                        choiceList[
                                            d
                                        ];
                                    dictItemList
                                        .push({
                                            text: val,
                                            value: val
                                        });
                                }
                                ele.dict =
                                    dictItemList;
                            }
                            ele.value =
                                attr
                                .value;
                        }
                    } else {
                        ele.setting
                            .colList
                            .forEach(
                                async (
                                    col
                                ) => {
                                    if (
                                        col) {
                                        let curIndex = data.findIndex((
                                            attr, index2, arr) => {
                                            return attr.attr == col.fieldId;
                                        })
                                        if (curIndex > -1) {
                                            const attr = data[curIndex]
                                            if (col.name ==
                                                'Select' &&
                                                attr
                                                .choice_list
                                            ) {
                                                const
                                                    dictItemList = [];
                                                const
                                                    choiceList =
                                                    attr
                                                    .choice_list || [];
                                                for (let d in
                                                        choiceList) {
                                                    const
                                                        val =
                                                        choiceList[
                                                            d
                                                        ];
                                                    dictItemList
                                                        .push({
                                                            text: val,
                                                            value: val
                                                        });
                                                }
                                                col.dict =
                                                    dictItemList;
                                            }
                                            col.value =
                                                attr
                                                .value;
                                        }
                                    }
                                })
                    }
                })
                this.setData({
                    head_styledef: head_styledef
                })
            },
            onClickItem(e) { //选择页签
                // console.log(e);
                this.current = e.currentIndex
@@ -1838,7 +1840,8 @@
                                                        .confirm
                                                    ) {
                                                        if (
                                                            pageData)
                                                            pageData
                                                        )
                                                            pageData
                                                            .DefList = [];
                                                        $this
@@ -1850,7 +1853,8 @@
                                                        .cancel
                                                    ) {
                                                        if (
                                                            pageData)
                                                            pageData
                                                        )
                                                            pageData
                                                            .DefList = [];
                                                        $this
@@ -1983,121 +1987,8 @@
                                        "set_dlg_attr") {
                                        // value = {"attr":"xxx", "value":"xxx"}
                                        var data = item.value;
                                        $this.$data.head_styledef
                                            .form.items.forEach(
                                                async (
                                                    ele, index
                                                ) => {
                                                    if (ele
                                                        .name !=
                                                        "Layout"
                                                    ) {
                                                        data.forEach(
                                                            async (ele2,
                                                                index
                                                            ) => {
                                                                if (ele
                                                                    .fieldId ==
                                                                    ele2
                                                                    .attr
                                                                ) {
                                                                    if (ele.name ==
                                                                        'Select' &&
                                                                        ele2
                                                                        .choice_list
                                                                    ) {
                                                                        const
                                                                            dictItemList = [];
                                                                        const
                                                                            choiceList =
                                                                            ele2
                                                                            .choice_list ||
                                                                            [];
                                                                        for (let d in
                                                                                choiceList) {
                                                                            const
                                                                                val =
                                                                                choiceList[
                                                                                    d
                                                                                ];
                                                                            dictItemList
                                                                                .push({
                                                                                    text: val,
                                                                                    value: val
                                                                                });
                                                                        }
                                                                        ele.dict =
                                                                            dictItemList;
                                                                    }
                                                                    ele.value =
                                                                        ele2
                                                                        .value;
                                                                }
                                                            });
                                                    } else {
                                                        ele.setting
                                                            .colList
                                                            .forEach(
                                                                async (
                                                                    col
                                                                ) => {
                                                                    if (
                                                                        col) {
                                                                        data.forEach(
                                                                            async (ele2,
                                                                                index
                                                                            ) => {
                                                                                if (col
                                                                                    .fieldId ==
                                                                                    ele2
                                                                                    .attr
                                                                                ) {
                                                                                    if (col
                                                                                        .name ==
                                                                                        'Select' &&
                                                                                        ele2
                                                                                        .choice_list
                                                                                    ) {
                                                                                        const
                                                                                            dictItemList = [];
                                                                                        const
                                                                                            choiceList =
                                                                                            ele2
                                                                                            .choice_list ||
                                                                                            [];
                                                                                        for (
                                                                                            let d in
                                                                                                choiceList
                                                                                        ) {
                                                                                            const
                                                                                                val =
                                                                                                choiceList[
                                                                                                    d
                                                                                                ];
                                                                                            dictItemList
                                                                                                .push({
                                                                                                    text: val,
                                                                                                    value: val
                                                                                                });
                                                                                        }
                                                                                        col.dict =
                                                                                            dictItemList;
                                                                                    }
                                                                                    col.value =
                                                                                        ele2
                                                                                        .value;
                                                                                }
                                                                            });
                                                                    }
                                                                })
                                                    }
                                                })
                                        $this.setFormValues(data)
                                    }
                                });
                            } else {