cuiqian2004
2024-11-04 46a69ec5c8c6dde5249832d46659f988fe16ec3f
test
2个文件已修改
110 ■■■■ 已修改文件
node_modules/.vue-global-types/vue_3.3_false.d.ts 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pages/modal/3018.vue 93 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
node_modules/.vue-global-types/vue_3.3_false.d.ts
@@ -65,6 +65,11 @@
        >
    >;
    type __VLS_PrettifyGlobal<T> = { [K in keyof T]: T[K]; } & {};
    type __VLS_PickFunctionalComponentCtx<T, K> = NonNullable<__VLS_PickNotAny<
        '__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: infer Ctx } ? Ctx : never : any
        , T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
    >>;
    type __VLS_UseTemplateRef<T> = Readonly<import('vue').ShallowRef<T | null>>;
    function __VLS_getVForSourceType(source: number): [number, number, number][];
    function __VLS_getVForSourceType(source: string): [string, number, number][];
@@ -93,9 +98,11 @@
    function __VLS_getSlotParams<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>;
    // @ts-ignore
    function __VLS_getSlotParam<T>(slot: T): Parameters<__VLS_PickNotAny<NonNullable<T>, (...args: any[]) => any>>[0];
    function __VLS_directiveAsFunction<T extends import('vue').Directive>(dir: T): T extends (...args: any) => any
        ? T | __VLS_unknownDirective
        : NonNullable<(T & Record<string, __VLS_unknownDirective>)['created' | 'beforeMount' | 'mounted' | 'beforeUpdate' | 'updated' | 'beforeUnmount' | 'unmounted']>;
    function __VLS_asFunctionalDirective<T>(dir: T): T extends import('vue').ObjectDirective
        ? NonNullable<T['created' | 'beforeMount' | 'mounted' | 'beforeUpdate' | 'updated' | 'beforeUnmount' | 'unmounted']>
        : T extends (...args: any) => any
            ? T
            : __VLS_unknownDirective;
    function __VLS_withScope<T, K>(ctx: T, scope: K): ctx is T & K;
    function __VLS_makeOptional<T>(t: T): { [K in keyof T]?: T[K] };
    function __VLS_nonNullable<T>(t: T): T extends null | undefined ? never : T;
@@ -111,10 +118,6 @@
        : (_: {} & Record<string, unknown>, ctx?: any) => { __ctx?: { attrs?: any, expose?: any, slots?: any, emit?: any, props?: {} & Record<string, unknown> } };
    function __VLS_elementAsFunction<T>(tag: T, endTag?: T): (_: T & Record<string, unknown>) => void;
    function __VLS_functionalComponentArgsRest<T extends (...args: any) => any>(t: T): 2 extends Parameters<T>['length'] ? [any] : [];
    function __VLS_pickFunctionalComponentCtx<T, K>(comp: T, compInstance: K): NonNullable<__VLS_PickNotAny<
        '__ctx' extends keyof __VLS_PickNotAny<K, {}> ? K extends { __ctx?: infer Ctx } ? Ctx : never : any
        , T extends (props: any, ctx: infer Ctx) => any ? Ctx : any
    >>;
    function __VLS_normalizeSlot<S>(s: S): S extends () => infer R ? (props: {}) => R : S;
    function __VLS_tryAsConstant<const T>(t: T): T;
}
pages/modal/3018.vue
@@ -26,7 +26,7 @@
                                :type="attr.Type=='整数' || attr.Type=='浮点数' || attr.Type=='int' || attr.Type=='float'?'number':'text'"
                                :value="attr.Value" @focus="ontap" @blur="onevent" v-if="attr.Height=='1'"
                                :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"
                                :disabled="attr.edit?false:true" >
                                :disabled="attr.edit?false:true">
                            <!-- =='flase'?true:false -->
                            <textarea :value="attr.Value" @focus="ontap" @blur="onevent" v-else-if="attr.Height=='2'"
                                :data-index="index" :data-iindex="iindex" style="height:60px;"
@@ -179,7 +179,8 @@
                                <a class="class_attr_add_per" @tap="classAttr_AddPer(index,iindex)"><i
                                        class="ace-icon fa fa-plus-circle"></i></a>
                            </div>
                            <input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true" :maxlength="-1">
                            <input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
                                :maxlength="-1">
                        </view>
                        <view v-if="classattr.control_style=='左右布局'">
                            <p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
@@ -202,7 +203,8 @@
                                <a href="#" class="class_attr_add_prj" @tap="classAttr_AddPrj(index,iindex)"><i
                                        class="ace-icon fa fa-plus-circle"></i></a>
                            </div>
                            <input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true" :maxlength="-1">
                            <input type="text" :value="attr.Value" :style="{'width':attr.Width}" disabled="true"
                                :maxlength="-1">
                        </view>
                        <view v-if="classattr.control_style=='左右布局'">
                            <p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
@@ -222,13 +224,13 @@
                            <text class="tx_title">{{attr.DispName}}:<i class="i_tishi"
                                    v-if="attr.notempty==true">*</i></text>
                            <input type="text" :data-index="index" :data-iindex="iindex" :style="{'width':attr.Width}"
                                :disabled="attr.edit?false:true"  :maxlength="-1">
                                :disabled="attr.edit?false:true" :maxlength="-1">
                        </view>
                        <view v-if="classattr.control_style=='左右布局'">
                            <p class="tx_title2" :style="{'width':classattr.title_p_wdith+'%'}">{{attr.DispName}}:</p>
                            <input type="text" class="attr_field" :data-index="index" :data-iindex="iindex"
                                :style="{'width': attr.Width.split('%')[0] - classattr.title_p_wdith - (attr.notempty==true?10:5) +'%'}"
                                :disabled="attr.edit?false:true"  :maxlength="-1">
                                :disabled="attr.edit?false:true" :maxlength="-1">
                            <i class="i_tishi" v-if="attr.notempty==true">*</i>
                        </view>
                    </view>
@@ -1315,55 +1317,50 @@
                };
                console.log(dataInfo);
                // return
                DataObjCreate(dataInfo).then((result) => {
                    console.log(result);
                DataObjCreate(dataInfo).then((res) => {
                    console.log(res);
                    uni.hideLoading();
                    if (result.action) {
                        var action = JSON.parse(result.action);
                        console.log(action);
                        if (action.ret == '0') {
                            if (action.ret != 0) {
                                uni.showModal({
                                    title: this.translateSys('tip'),
                                    content: this.translate('execute_script_failed') +
                                        this
                                        .translateSys('comma') + this.translate(
                                            'result') +
                                        this
                                        .translateSys('colon') + action.result,
                                    showCancel: false,
                                    confirmText: this.translateSys('cancel')
                                });
                                return;
                            }
                            if (action.info) {
                                uni.showModal({
                                    title: this.translateSys('tip'),
                                    content: this.translate('execute_script_failed') +
                                        this
                                        .translateSys('comma') +
                                        this.translateSys('colon') + action.info,
                                    showCancel: false,
                                    confirmText: this.translateSys('cancel')
                                });
                                return;
                            }
                            if (action.result_type == '0') {
                                uni.showToast({
                                    title: action.result,
                                    icon: "success",
                                    duration: 3000
                                });
                            }
                            // "{"ret":0, "result_type":0, "result":"创建成功123123123","info":""}"
                        }
                    } else
                    let data = res.lua_result
                    if (data.ret != 0) {
                        var tip = data.err_info ? typeof data.err_info == 'string' ? data
                            .err_info :
                            data
                            .err_info.join('<br/>') : '';
                        if (data.ret == 801) uni.showModal({
                            title: this.translateSys('tip'),
                            content: tip,
                            showCancel: false,
                            confirmText: this.translateSys('cancel')
                        });
                        else uni.showModal({
                            title: this.translateSys('tip'),
                            content: tip + ',' + this.translateSys('tip') + ':' + data
                                .ret,
                            showCancel: false,
                            confirmText: this.translateSys('cancel')
                        });
                        return false
                    } else {
                        var tip = data.info ? typeof data.info == 'string' ? data.info : data
                            .info
                            .join(
                                '<br/>') : '';
                        if (tip) uni.showModal({
                            title: this.translateSys('tip'),
                            content: tip,
                            showCancel: false,
                            confirmText: this.translateSys('cancel')
                        });
                        uni.showToast({
                            title: this.translate('create_success'),
                            icon: "success",
                            duration: 3000
                        });
                    }
                    //刷新
                    uni.redirectTo({
                        url: '../modal/3018?param=' + JSON.stringify(this.$data