Merge branch 'master' of http://49.233.37.222:3000/wjm/mec-cloud_IntelligentManufacturing_CRM

ruoyi-ui/src/App.vue

@@ -25,4 +25,5 @@ export default {
 #app .theme-picker {
   display: none;
 }
+
 </style>

ruoyi-ui/src/components/updateModule/k-form-design/packages/components/KFormDesign/module/formItemProperties.vue

@@ -139,8 +139,9 @@
         <a-form-item v-if="isDefined(options.dictCode)" label="dictCode">
           <Input v-model="options.dictCode" />
         </a-form-item>
+
         <!-- 选项配置及动态数据配置 start -->
-        <!-- <a-form-item v-if="isDefined(options.options)" label="选项配置">
+        <a-form-item v-if="isDefined(options.options)" label="选项配置">
           <Radio buttonStyle="solid" v-model="options.dynamic">
             <RadioButton :value="false">静态数据</RadioButton>
             <RadioButton :value="true">动态数据</RadioButton>
@@ -153,8 +154,9 @@
           />
 
           <KChangeOption v-show="!options.dynamic" v-model="options.options" />
-        </a-form-item> -->
+        </a-form-item>
         <!-- 选项配置及动态数据配置 end -->
+
         <!-- tabs配置 start -->
         <a-form-item
           v-if="['tabs', 'selectInputList'].includes(selectItem.type)"
@@ -194,6 +196,7 @@
             :count="options.max"
           />
         </a-form-item>
+        
         <a-form-item v-if="selectItem.type === 'select'" label="默认值">
           <Select
             :options="formList.listName"
@@ -208,13 +211,15 @@
               :value="item.fieldName">
             </el-option> -->
         </a-form-item>
+
         <a-form-item v-if="selectItem.type === 'radio'" label="默认值">
           <Radio :options="options.options" v-model="options.defaultValue" />
         </a-form-item>
+
         <a-form-item v-if="selectItem.type === 'checkbox'" label="默认值">
           <Checkbox :options="options.options" v-model="options.defaultValue" />
         </a-form-item>
-        <!-- 日期选择器默认值 start -->
+        <!-- 默认值 start -->
         <a-form-item v-if="selectItem.type === 'date'" label="默认值">
           <Input
             v-if="!options.range"

ruoyi-ui/src/layout/components/Sidebar/index.vue

@@ -1,6 +1,5 @@
 <template>
   <div
-    @mouseleave="mouseleaveHandler"
     :class="{ 'has-logo': showLogo }"
     :style="{
       backgroundColor:
@@ -84,9 +83,6 @@ export default {
     },
   },
   methods: {
-    mouseleaveHandler() {
-      console.log(123);
-    },
     onLayoutResize() {
       // const clientWidth = document.documentElement.clientWidth;
       const rect = document.body.getBoundingClientRect();

ruoyi-ui/src/views/system/fromModel/index.vue

@@ -115,7 +115,7 @@ export default {
     this.fid = fid;
 
     getForm(fid).then((response) => {
-      console.log(response);
+      console.log('res', response);
       sessionStorage.setItem("sqlKey", response.data.sqlKey);
       const jsonData = JSON.parse(response.data.dfVueTemplate);
       this.$refs.kfd.handleSetData(jsonData);

ruoyi-ui/src/views/system/tenant/index.vue

@@ -610,6 +610,7 @@ export default {
      * 选择数据源校验名称
      */
     selecthandle(row) {
+      // console.log(row);
       let sql = {
         sqlserver: "sqlserver_connection_information",
         mysql: "mysql_connection_information",

ruoyi-ui/src/views/tablelist/commonTable/listInfo.vue

@@ -179,6 +179,7 @@
       >
       </iframe> -->
       <k-form-build
+        class="formBuild"
         ref="addFromRef"
         :defaultValue="defaultValue"
         @submit="tempSubBtn"
@@ -473,7 +474,7 @@ export default {
         Object.assign(this.defaultValue, row);
         this.jsonData = JSON.parse(data.dfVueTemplate);
         this.open = true;
-        this.title = "修改信息";
+        this.title = "修改信息123";
         this.form.password = this.initPassword;
         this.$nextTick(() => {
           this.$refs.addFromRef.setData(row);
@@ -679,4 +680,6 @@ export default {
 };
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+
+</style>